use strict;
-# dynamic scalar. MUST BE REDUCED IN SIZE!!!
+# scalar. MUST BE REDUCED IN SIZE!!!
### TODO: reorder.
use vars qw(
$bot_misc_dir $bot_pid $bot_base_dir $bot_src_dir
$running
);
-# dynamic hash.
+# array.
use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache
);
-### dynamic hash. MUST BE REDUCED IN SIZE!!!
+### hash. MUST BE REDUCED IN SIZE!!!
#
use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig
%nuh %talkWho %seen %floodwarn %param %dbh %ircPort
$last{buflen} = 0;
$last{say} = "";
$last{msg} = "";
-$userHandle = "default";
+$userHandle = "_default";
$wingaterun = time();
$firsttime = 1;
$utime_userfile = 0;
###
if ( -d "CVS" ) {
use POSIX qw(strftime);
- $bot_release = strftime("cvs (%Y%m%d)", localtime( (stat("CVS"))[9] ) );
+ $bot_release = strftime("cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
} else {
$bot_release = "1.0.10 (2001xxxx)";
}
&status("--- Start of quit.");
$ident ||= "blootbot"; # lame hack.
- &closeDCC();
+ &status("Memory Usage: $memusage kB");
+
&closePID();
&closeStats();
- &seenFlush();
- &quit($param{'quitMsg'}) if (&whatInterface() =~ /IRC/);
+ # shutdown IRC and related components.
+ if (&whatInterface() =~ /IRC/) {
+ &closeDCC();
+ &seenFlush();
+ &quit($param{'quitMsg'});
+ }
&writeUserFile();
&writeChanFile();
- &uptimeWriteFile() if (&ChanConfList("uptime"));
- &News::writeNews() if (&ChanConfList("news"));
- &closeDB();
+ &uptimeWriteFile() if (&IsChanConf("uptime"));
+ &sqlCloseDB();
&closeSHM($shm);
&dumpallvars() if (&IsParam("dumpvarsAtExit"));
+ &symdumpAll() if (&IsParam("symdumpAtExit"));
&closeLog();
&closeSQLDebug() if (&IsParam("SQLDebug"));
return 0;
}
+ # should we use IsParam() externally where needed or hack it in
+ # here just in case? fix it later.
+ if (&IsParam($param)) {
+ &DEBUG("ICC: found '$param' option in main config file.");
+ return 1;
+ }
+
$chan ||= "_default";
my $old = $chan;
my($param,$c) = @_;
if (!defined $param) {
- &WARN("param == NULL.");
+ &WARN("gCC: param == NULL.");
return 0;
}
$c ||= $chan;
$c ||= "_default";
$c = "_default" if ($c eq "*"); # fix!
- my @c = grep /^$c$/i, keys %chanconf;
+ my @c = grep /^\Q$c\E$/i, keys %chanconf;
if (@c) {
if (0 and $c[0] ne $c) {
return $chanconf{"_default"}{$param};
}
+sub getChanConfDefault {
+ my($what, $default, $chan) = @_;
+
+ $chan ||= "_default";
+
+ if (exists $param{$what}) {
+ if (!exists $cache{config}{$what}) {
+ &status("Config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead");
+ $cache{config}{$what} = 1;
+ }
+
+ return $param{$what};
+ }
+ my $val = &getChanConf($what, $chan);
+ return $val if (defined $val);
+
+ $param{$what} = $default;
+ &status("Config ($chan): auto-setting param{$what} = $default");
+ $cache{config}{$what} = 1;
+ return $default;
+}
+
+
#####
# Usage: &findChanConf($param);
# About: Retrieve value for 'param' value from any chan.
foreach (keys %{ $chanconf{$c} }) {
next unless (/^$param$/);
- &DEBUG("chanconf{$c}{$_} ...");
return $chanconf{$c}{$_};
}
}
close IN;
} elsif ($^O eq "netbsd") {
- $memusage = (stat "/proc/$$/mem")[7]/1024;
+ $memusage = int( (stat "/proc/$$/mem")[7]/1024 );
} elsif ($^O =~ /^(free|open)bsd$/) {
my @info = split /\s+/, `/bin/ps -l -p $$`;
} else { # delta < 0.
$delta = -$delta;
# never knew RSS could decrease, probably Size can't?
- $str = "MEM:$prefix decreased by $delta kB. YES YES YES";
+ $str = "MEM:$prefix decreased by $delta kB.";
}
&status($str);
&openLog(); # write, append.
&status("--- Started logging.");
- foreach ("debian") {
- my $dir = "$bot_base_dir/$_/";
- next if ( -d $dir);
- &status("Making dir $_");
- mkdir $dir, 0755;
- }
-
# read.
&loadLang($bot_data_dir. "/blootbot.lang");
&loadIRCServers();
$shm = &openSHM();
&openSQLDebug() if (&IsParam("SQLDebug"));
- &openDB($param{'DBName'}, $param{'SQLUser'}, $param{'SQLPass'});
+ &sqlOpenDB($param{'DBName'}, $param{'DBType'}, $param{'SQLUser'},
+ $param{'SQLPass'});
&checkTables();
&status("Setup: ". &countKeys("factoids") ." factoids.");
- &News::readNews() if (&ChanConfList("news"));
&getChanConfDefault("sendPrivateLimitLines", 3);
&getChanConfDefault("sendPrivateLimitBytes", 1000);
&getChanConfDefault("sendPublicLimitLines", 3);
$param{'VERBOSITY'} = 1;
&loadConfig($bot_config_dir."/blootbot.config");
- foreach ("ircNick", "ircUser", "ircName", "DBType", "tempDir") {
+ foreach ( qw(ircNick ircUser ircName DBType tempDir) ) {
next if &IsParam($_);
&ERROR("Parameter $_ has not been defined.");
exit 1;
if (! -d $param{tempDir}) {
&status("making $param{tempDir}...");
- system("mkdir $param{tempDir}");
+ mkdir $param{tempDir}, 0755;
}
# static scalar variables.
}
sub shutdown {
+ my ($sig) = @_;
# reverse order of &setup().
&status("--- shutdown called.");
$ident ||= "blootbot"; # hack.
- # opened files must be written to on shutdown/hup/whatever
- # unless they're write-only, like uptime.
- &writeUserFile();
- &writeChanFile();
- &News::writeNews() if (&ChanConfList("news"));
+ if (!&isFileUpdated("$bot_state_dir/blootbot.users", $wtime_userfile)) {
+ &writeUserFile()
+ }
+
+ if (!&isFileUpdated("$bot_state_dir/blootbot.chan", $wtime_chanfile)) {
+ &writeChanFile();
+ }
- &closeDB();
+ &sqlCloseDB();
&closeSHM($shm); # aswell. TODO: use this in &doExit?
&closeLog();
}
&status("--- $sig called.");
### crappy bug in Net::IRC?
- if (!$conn->connected and time - $msgtime > 900) {
- &status("reconnecting because of uncaught disconnect \@ ".scalar(localtime) );
+ my $delta = time() - $msgtime;
+ &DEBUG("restart: dtime = $delta");
+ if (!$conn->connected or time() - $msgtime > 900) {
+ &status("reconnecting because of uncaught disconnect \@ ".scalar(gmtime) );
### $irc->start;
&clearIRCVars();
$conn->connect();
&ircCheck(); # heh, evil!
&DCCBroadcast("-HUP called.","m");
- &shutdown();
+ &shutdown($sig);
&loadConfig($bot_config_dir."/blootbot.config");
&reloadAllModules() if (&IsParam("DEBUG"));
&setup();
projects / infobot.git / blobdiff