X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FSchedulers.pl;h=bf254ba6c6d46f85b2d92a68a8678df98bde668b;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=82261388fb62409c89008ed57e782ded559cb89e;hpb=f5573d1d866fb83a5dcc196a8ee0abdd77a85c94;p=infobot.git diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index 8226138..bf254ba 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -5,10 +5,50 @@ # Created: 20000117 # -if (&IsParam("useStrict")) { use strict; } +# use strict; # TODO use POSIX qw(strftime); -use vars qw(%sched); +use vars qw(%sched %schedule); + +# format: function name = ( +# str chanconfdefault, +# int internaldefault, +# bool deferred, +# int next run, (optional) +# ) + +#%schedule = { +# uptimeLoop => ("", 60, 1), +#}; + +sub setupSchedulersII { + foreach (keys %schedule) { + &queueTask($_, @{ $schedule{$_} }); + } +} + +sub queueTask { + my($codename, $chanconfdef, $intervaldef, $defer) = @_; + my $t = &getChanConfDefault($chanconfdef, $intervaldef); + my $waittime = &getRandomInt($t); + + if (!defined $waittime) { + &WARN("interval == waittime == UNDEF for $codename."); + return; + } + + my $time = $schedule{$codename}[3]; + if (defined $time and $time > time()) { + &WARN("Sched for $codename already exists."); + return; + } + +# &VERB("Scheduling \&$codename() for ".&Time2String($waittime),3); + + my $retval = $conn->schedule($waittime, sub { + \&$codename; + }, @args ); +} sub setupSchedulers { &VERB("Starting schedulers...",2); @@ -20,7 +60,6 @@ sub setupSchedulers { &uptimeLoop(1); &randomQuote(2); &randomFactoid(2); - &randomFreshmeat(2); &logLoop(1); &chanlimitCheck(1); &netsplitCheck(1); # mandatory @@ -29,21 +68,22 @@ sub setupSchedulers { &leakCheck(2); # mandatory &ignoreCheck(1); # mandatory &seenFlushOld(2); - &ircCheck(2); # mandatory + &ircCheck(1); # mandatory &miscCheck(1); # mandatory &miscCheck2(2); # mandatory &shmFlush(1); # mandatory &slashdotLoop(2); - &freshmeatLoop(2); + &plugLoop(2); &kernelLoop(2); &wingateWriteFile(2); - &factoidCheck(2); + &factoidCheck(2); # takes a couple of seconds on a 486. defer it +# todo: convert to new format... or nuke altogether. &newsFlush(1); + # todo: squeeze this into a one-liner. # my $count = map { exists $sched{$_}{TIME} } keys %sched; my $count = 0; foreach (keys %sched) { -# next unless (exists $sched{$_}{TIME}); my $time = $sched{$_}{TIME}; next unless (defined $time and $time > time()); @@ -88,7 +128,7 @@ sub randomQuote { return if ($_[0] eq "2"); # defer. } - my $line = &getRandomLineFromFile($bot_misc_dir. "/blootbot.randtext"); + my $line = &getRandomLineFromFile($bot_data_dir. "/blootbot.randtext"); if (!defined $line) { &ERROR("random Quote: weird error?"); return; @@ -136,29 +176,6 @@ sub randomFactoid { } } -sub randomFreshmeat { - my $interval = &getChanConfDefault("randomFresheatInterval", 60); - - if (@_) { - &ScheduleThis($interval, "randomFreshmeat"); - return if ($_[0] eq "2"); # defer. - } - - my @chans = &ChanConfList("randomFreshmeat"); - return unless (scalar @chans); - - &Forker("freshmeat", sub { - my $retval = &Freshmeat::randPackage(); - - foreach (@chans) { - next unless (&validChan($_)); - - &status("sending random Freshmeat to $_."); - &say($_, $line); - } - } ); -} - sub logLoop { if (@_) { &ScheduleThis(60, "logLoop"); @@ -171,7 +188,7 @@ sub logLoop { ### check if current size is too large. if ( -s $file{log} > $param{'maxLogSize'}) { - my $date = sprintf("%04d%02d%02d", (localtime)[5,4,3]); + my $date = sprintf("%04d%02d%02d", (gmtime)[5,4,3]); $file{log} = $param{'logfile'} ."-". $date; &status("cycling log file."); @@ -194,41 +211,38 @@ sub logLoop { } ### check if all the logs exceed size. - my $logdir = "$bot_base_dir/log/"; - if (opendir(LOGS, $logdir)) { - my $tsize = 0; - my (%age, %size); - - while (defined($_ = readdir LOGS)) { - my $logfile = "$logdir/$_"; + if (!opendir(LOGS, $bot_log_dir)) { + &WARN("logLoop: could not open dir '$bot_log_dir'"); + return; + } - next unless ( -f $logfile); - my $size = -s $logfile; - my $age = (stat $logfile)[9]; + my $tsize = 0; + my (%age, %size); + while (defined($_ = readdir LOGS)) { + my $logfile = "$bot_log_dir/$_"; - $age{$age} = $logfile; - $size{$logfile} = $size; + next unless ( -f $logfile); - $tsize += $size; - } - closedir LOGS; - - my $delete = 0; - while ($tsize > $param{'maxLogSize'}) { - &status("LOG: current size > max ($tsize > $param{'maxLogSize'})"); - my $oldest = (sort {$a <=> $b} keys %age)[0]; - &status("LOG: unlinking $age{$oldest}."); - unlink $age{$oldest}; - $tsize -= $oldest; - $delete++; - } + my $size = -s $logfile; + my $age = (stat $logfile)[9]; + $age{$age} = $logfile; + $size{$logfile} = $size; + $tsize += $size; + } + closedir LOGS; - ### TODO: add how many b,kb,mb removed? - &status("LOG: removed $delete logs.") if ($delete); - } else { - &WARN("could not open dir $logdir"); + my $delete = 0; + while ($tsize > $param{'maxLogSize'}) { + &status("LOG: current size > max ($tsize > $param{'maxLogSize'})"); + my $oldest = (sort {$a <=> $b} keys %age)[0]; + &status("LOG: unlinking $age{$oldest}."); + unlink $age{$oldest}; + $tsize -= $oldest; + $delete++; } + ### TODO: add how many b,kb,mb removed? + &status("LOG: removed $delete logs.") if ($delete); } sub seenFlushOld { @@ -245,31 +259,29 @@ sub seenFlushOld { my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24; my $delete = 0; - if ($param{'DBType'} =~ /^pg|postgres|mysql/i) { - my $query = "SELECT nick,time FROM seen GROUP BY nick HAVING UNIX_TIMESTAMP() - time > $max_time"; - my $sth = $dbh->prepare($query); - $sth->execute; - - while (my @row = $sth->fetchrow_array) { - my ($nick,$time) = @row; + if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite)/i) { + my $query; - &dbDel("seen","nick",$nick); - $delete++; + if ($param{'DBType'} =~ /^mysql|sqlite$/i) { + $query = "SELECT nick,time FROM seen GROUP BY nick HAVING ". + "UNIX_TIMESTAMP() - time > $max_time"; + } else { # pgsql. + $query = "SELECT nick,time FROM seen WHERE ". + "extract(epoch from timestamp 'now') - time > $max_time"; } - $sth->finish; - } elsif ($param{'DBType'} =~ /^dbm/i) { - my $time = time(); - foreach (keys %seen) { - my $delta_time = $time - &dbGet("seen", "NULL", $_, "time"); - next unless ($delta_time > $max_time); + my $sth = $dbh->prepare($query); + if ($sth->execute) { + while (my @row = $sth->fetchrow_array) { + my ($nick,$time) = @row; - &DEBUG("seenFlushOld: ".&Time2String($delta_time) ); - delete $seen{$_}; - $delete++; + &sqlDelete("seen", { nick => $nick } ); + $delete++; + } + $sth->finish; } } else { - &FIXME("seenFlushOld: for PG/NO-DB."); + &FIXME("seenFlushOld: for bad DBType:" . $param{'DBType'} . "."); } &VERB("SEEN deleted $delete seen entries.",2); @@ -281,9 +293,8 @@ sub newsFlush { return if ($_[0] eq "2"); # defer. } - if (&IsChanConf("news") > 0) { - } else { - &DEBUG("newsFlush: news disabled?"); + if (!&ChanConfList("news")) { + &DEBUG("newsFlush: news disabled? (chan => $chan)"); return; } @@ -294,7 +305,10 @@ sub newsFlush { my $i = 0; my $total = scalar(keys %{ $::news{$chan} }); - &DEBUG("newsFlush: chan => $chan"); + if (!$total) { + delete $::news{$chan}; + next; + } foreach $item (keys %{ $::news{$chan} }) { my $t = $::news{$chan}{$item}{Expire}; @@ -320,7 +334,7 @@ sub newsFlush { $i++; } - &status("NEWS (newsflush) {$chan}: deleted [$i/$total] news entries."); + &status("NEWS (newsflush) {$chan}: deleted [$i/$total] news entries.") if ($i); $none{$chan} = 1 if ($total == $i); } @@ -341,12 +355,13 @@ sub newsFlush { delete $::newsuser{$chan}{$_}; $duser++; } + + my $i = scalar(keys %{ $::newsuser{$chan} }); + delete $::newsuser{$chan} unless ($i); } if ($delete or $duser) { - &DEBUG("newsF: Writing news."); - &News::writeNews(); - &status("NEWS (newsflush) deleted: $delete news entries; $duser user cache."); + &status("NewsFlush: deleted: $delete news entries; $duser user cache."); } } @@ -358,36 +373,43 @@ sub chanlimitCheck { return if ($_[0] eq "2"); } + my $str = join(' ', &ChanConfList("chanlimitcheck") ); + foreach $chan ( &ChanConfList("chanlimitcheck") ) { next unless (&validChan($chan)); + if ($chan eq "_default") { + &WARN("chanlimit: we're doing $chan!! HELP ME!"); + next; + } + my $limitplus = &getChanConfDefault("chanlimitcheckPlus", 5, $chan); my $newlimit = scalar(keys %{ $channels{$chan}{''} }) + $limitplus; my $limit = $channels{$chan}{'l'}; if (scalar keys %netsplitservers) { if (defined $limit) { - &DEBUG("chanlimit: removing it for $chan."); - &rawout("MODE $chan -l"); + &status("chanlimit: netsplit; removing it for $chan."); + $conn->mode($chan, "-l"); $cache{chanlimitChange}{$chan} = time(); + &status("chanlimit: netsplit; removed."); } next; } if (defined $limit and scalar keys %{ $channels{$chan}{''} } > $limit) { - &FIXME("LIMIT: set too low!!! FIXME"); + &FIXME("LIMIT: set too low!!!"); ### run NAMES again and flush it. } - next unless (!defined $limit); if (defined $limit and $limit == $newlimit) { $cache{chanlimitChange}{$chan} = time(); next; } if (!exists $channels{$chan}{'o'}{$ident}) { - &status("ChanLimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan}); + &status("chanlimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan}); $cache{warn}{chanlimit}{$chan} = 1; &chanServCheck($chan); next; @@ -395,18 +417,18 @@ sub chanlimitCheck { delete $cache{warn}{chanlimit}{$chan}; if (!defined $limit) { - &status("ChanLimit: setting for first time or from netsplit, for $chan"); + &status("chanlimit: $chan: setting for first time or from netsplit."); } if (exists $cache{chanlimitChange}{$chan}) { my $delta = time() - $cache{chanlimitChange}{$chan}; if ($delta < $interval*60) { - &DEBUG("not going to change chanlimit! ($delta<$interval*60)"); + &DEBUG("chanlimit: not going to change chanlimit! ($delta<$interval*60)"); return; } } - &rawout("MODE $chan +l $newlimit"); + $conn->mode($chan, "+l", $newlimit); $cache{chanlimitChange}{$chan} = time(); } } @@ -415,35 +437,71 @@ sub netsplitCheck { my ($s1,$s2); if (@_) { - &ScheduleThis(30, "netsplitCheck"); + &ScheduleThis(15, "netsplitCheck"); return if ($_[0] eq "2"); } + $cache{'netsplitCache'}++; +# &DEBUG("running netsplitCheck... $cache{netsplitCache}"); + + if (!scalar %netsplit and scalar %netsplitservers) { + &DEBUG("nsC: !hash netsplit but hash netsplitservers <- removing!"); + undef %netsplitservers; + return; + } + + # well... this shouldn't happen since %netsplit code does it anyway. foreach $s1 (keys %netsplitservers) { + foreach $s2 (keys %{ $netsplitservers{$s1} }) { - if (time() - $netsplitservers{$s1}{$s2} > 3600) { + my $delta = time() - $netsplitservers{$s1}{$s2}; + + if ($delta > 60*30) { &status("netsplit between $s1 and $s2 appears to be stale."); delete $netsplitservers{$s1}{$s2}; + &chanlimitCheck(); } } + + my $i = scalar(keys %{ $netsplitservers{$s1} }); + delete $netsplitservers{$s1} unless ($i); } # %netsplit hash checker. my $count = scalar keys %netsplit; + my $delete = 0; foreach (keys %netsplit) { - if (&IsNickInAnyChan($_)) { - &DEBUG("netsplitC: $_ is in some chan; removing from netsplit list."); + if (&IsNickInAnyChan($_)) { # why would this happen? +# &DEBUG("nsC: $_ is in some chan; removing from netsplit list."); delete $netsplit{$_}; + $delete++; next; } - next unless (time() - $netsplit{$_} > 60*10); - &DEBUG("netsplitC: $_ didn't come back from netsplit; removing from netsplit list."); + next unless (time() - $netsplit{$_} > 60*15); + + $delete++; delete $netsplit{$_}; } - &DEBUG("nsC: netsplitservers: ".scalar(keys %netsplitservers) ); - &DEBUG("nsC: netsplit: ".scalar(keys %netsplit) ); + # yet another hack. + foreach (keys %channels) { + my $i = $cache{maxpeeps}{$chan} || 0; + my $j = scalar(keys %{ $channels{$chan} }); + next unless ($i > 10 and 0.25*$i > $j); + + &DEBUG("netsplit: 0.25*max($i) > current($j); possible netsplit?"); + } + + if ($delete) { + my $j = scalar(keys %netsplit); + &status("nsC: removed from netsplit list: (before: $count; after: $j)"); + } + + if (!scalar %netsplit and scalar %netsplitservers) { + &DEBUG("nsC: ok hash netsplit is NULL; purging hash netsplitservers"); + undef %netsplitservers; + } if ($count and !scalar keys %netsplit) { &DEBUG("nsC: netsplit is hopefully gone. reinstating chanlimit check."); @@ -493,65 +551,15 @@ sub seenFlush { $stats{'new'} = 0; $stats{'old'} = 0; - if ($param{'DBType'} =~ /^mysql|pg|postgres/i) { - foreach $nick (keys %seencache) { - my $retval = &dbReplace("seen", "nick", $nick, ( - "nick" => $seencache{$nick}{'nick'}, - "time" => $seencache{$nick}{'time'}, - "host" => $seencache{$nick}{'host'}, - "channel" => $seencache{$nick}{'chan'}, - "message" => $seencache{$nick}{'msg'}, - ) ); - delete $seencache{$nick}; - $flushed++; - - next; - - ### - ### old code. - ### - - my $exists = &dbGet("seen","nick", $nick, "nick"); - - if (defined $exists and $exists) { - &dbUpdate("seen", "nick", $nick, ( - "time" => $seencache{$nick}{'time'}, - "host" => $seencache{$nick}{'host'}, - "channel" => $seencache{$nick}{'chan'}, - "message" => $seencache{$nick}{'msg'}, - ) ); - $stats{'old'}++; - } else { - my $retval = &dbInsert("seen", $nick, ( - "nick" => $seencache{$nick}{'nick'}, - "time" => $seencache{$nick}{'time'}, - "host" => $seencache{$nick}{'host'}, - "channel" => $seencache{$nick}{'chan'}, - "message" => $seencache{$nick}{'msg'}, - ) ); - $stats{'new'}++; - - ### TODO: put bad nick into a list and don't do it again! - &FIXME("Should never happen! (nick => $nick)") if !$retval; - } - - delete $seencache{$nick}; - $flushed++; - } - - } elsif ($param{'DBType'} =~ /^dbm/i) { - + if ($param{'DBType'} =~ /^(mysql|pgsql|sqlite)$/i) { foreach $nick (keys %seencache) { - my $retval = &dbInsert("seen", $nick, ( - "nick" => $seencache{$nick}{'nick'}, - "time" => $seencache{$nick}{'time'}, - "host" => $seencache{$nick}{'host'}, - "channel" => $seencache{$nick}{'chan'}, - "message" => $seencache{$nick}{'msg'}, - ) ); - - ### TODO: put bad nick into a list and don't do it again! - &FIXME("Should never happen! (nick => $nick)") if !$retval; + my $retval = &sqlReplace("seen", { + nick => lc $seencache{$nick}{'nick'}, + time => $seencache{$nick}{'time'}, + host => $seencache{$nick}{'host'}, + channel => $seencache{$nick}{'chan'}, + message => $seencache{$nick}{'msg'}, + } ); delete $seencache{$nick}; $flushed++; @@ -560,7 +568,7 @@ sub seenFlush { &DEBUG("seenFlush: NO VALID FACTOID SUPPORT?"); } - &status("Flushed $flushed seen entries.") if ($flushed); + &status("Seen: Flushed $flushed entries.") if ($flushed); &VERB(sprintf(" new seen: %03.01f%% (%d/%d)", $stats{'new'}*100/($stats{'count_old'} || 1), $stats{'new'}, ( $stats{'count_old'} || 1) ), 2) if ($stats{'new'}); @@ -586,7 +594,7 @@ sub leakCheck { $count += scalar(keys %{ $flood{$blah1}{$blah2} }); } } - &DEBUG("leak: hash flood has $count total keys.",2); + &VERB("leak: hash flood has $count total keys.",2); # floodjoin. $count = 0; @@ -595,11 +603,11 @@ sub leakCheck { $count += scalar(keys %{ $floodjoin{$blah1}{$blah2} }); } } - &DEBUG("leak: hash floodjoin has $count total keys.",2); + &VERB("leak: hash floodjoin has $count total keys.",2); # floodwarn. $count = scalar(keys %floodwarn); - &DEBUG("leak: hash floodwarn has $count total keys.",2); + &VERB("leak: hash floodwarn has $count total keys.",2); my $chan; foreach $chan (grep /[A-Z]/, keys %channels) { @@ -614,7 +622,7 @@ sub leakCheck { # chanstats $count = scalar(keys %chanstats); - &DEBUG("leak: hash chanstats has $count total keys.",2); + &VERB("leak: hash chanstats has $count total keys.",2); # nuh. my $delete = 0; @@ -652,25 +660,32 @@ sub ignoreCheck { $count++; } } + + $cache{ignoreCheckTime} = time(); + &VERB("ignore: $count items deleted.",2); } sub ircCheck { if (@_) { - &ScheduleThis(60, "ircCheck"); + &ScheduleThis(15, "ircCheck"); return if ($_[0] eq "2"); # defer. } + $cache{statusSafe} = 1; + my @x = &getJoinChans(); my $iconf = scalar( @x ); my $inow = scalar( keys %channels ); if ($iconf > 2 and $inow * 2 <= $iconf) { - &FIXME("ircCheck: current channels * 2 <= config channels. FIXME."); - @joinchan = @x; + &FIXME("ircCheck: current channels ($inow) * 2 <= config channels ($iconf)."); +# @joinchan = @x; &joinNextChan(); } - if (!$conn->connected or time() - $msgtime > 3600) { + # todo: fix on_disconnect() + + if (time() - $msgtime > 3600) { # todo: shouldn't we use cache{connect} somewhere? if (exists $cache{connect}) { &WARN("ircCheck: no msg for 3600 and disco'd! reconnecting!"); @@ -679,7 +694,7 @@ sub ircCheck { delete $cache{connect}; } else { &status("IRCTEST: possible lost in space; checking. ". - scalar(localtime) ); + scalar(gmtime) ); &msg($ident, "TEST"); $cache{connect} = time(); } @@ -687,7 +702,7 @@ sub ircCheck { if ($ident !~ /^\Q$param{ircNick}\E$/) { # this does not work unfortunately. - &WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick})."); + &WARN("ircCheck: ident($ident) != param{ircNick}($param{ircNick})."); # this check is misleading... perhaps we should do a notify. if (! &IsNickInAnyChan( $param{ircNick} ) ) { @@ -700,19 +715,14 @@ sub ircCheck { if (grep /^\s*$/, keys %channels) { &WARN("ircCheck: we have a NULL chan in hash channels? removing!"); - if (exists $channels{''}) { - &DEBUG("ircCheck: ok it existed!"); - } else { - &DEBUG("ircCheck: this hsould never happen!"); + if (!exists $channels{''}) { + &DEBUG("ircCheck: this should never happen!"); } delete $channels{''}; } - &DEBUG("ircstats..."); - &DEBUG(" pubsleep: $pubsleep"); - &DEBUG(" msgsleep: $msgsleep"); - &DEBUG(" notsleep: $notsleep"); + $cache{statusSafe} = 0; ### USER FILE. if ($utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600) { @@ -728,7 +738,7 @@ sub ircCheck { sub miscCheck { if (@_) { - &ScheduleThis(240, "miscCheck"); + &ScheduleThis(120, "miscCheck"); return if ($_[0] eq "2"); # defer. } @@ -751,13 +761,18 @@ sub miscCheck { my ($shmid, $size) = ($2,$5); next unless ($shmid != $shm and $size == 2000); my $z = &shmRead($shmid); - if ($z =~ /^(\d+): /) { - my $time = $1; + if ($z =~ /^(\S+):(\d+):(\d+): /) { + my $n = $1; + my $pid = $2; + my $time = $3; next if (time() - $time < 60*60); - + # FIXME remove not-pid shm if parent process dead + next if ($pid == $bot_pid); + # don't touch other bots, if they're running. + next unless ($param{ircNick} =~ /^\Q$n\E$/); } else { -# &DEBUG("shm: $shmid is not ours or old blootbot => ($z)"); -# next; + &DEBUG("shm: $shmid is not ours or old blootbot => ($z)"); + next; } &status("SHM: nuking shmid $shmid"); @@ -765,8 +780,8 @@ sub miscCheck { } # make backup of important files. - &mkBackup( $bot_misc_dir."/blootbot.chan", 60*60*24*3); - &mkBackup( $bot_misc_dir."/blootbot.users", 60*60*24*3); + &mkBackup( $bot_state_dir."/blootbot.chan", 60*60*24*3); + &mkBackup( $bot_state_dir."/blootbot.users", 60*60*24*3); &mkBackup( $bot_base_dir."/blootbot-news.txt", 60*60*24*1); # flush cache{lobotomy} @@ -785,79 +800,39 @@ sub miscCheck2 { return if ($_[0] eq "2"); # defer. } - &DEBUG("miscCheck2: Doing debian checking..."); - # debian check. - opendir(DEBIAN, "$bot_base_dir/debian"); + opendir(DEBIAN, "$bot_state_dir/debian"); foreach ( grep /gz$/, readdir(DEBIAN) ) { - my $exit = CORE::system("gzip -t $bot_base_dir/debian/$_"); + my $exit = CORE::system("gzip -t $bot_state_dir/debian/$_"); next unless ($exit); &status("debian: unlinking file => $_"); - unlink "$bot_base_dir/debian/$_"; + unlink "$bot_state_dir/debian/$_"; } closedir DEBIAN; # compress logs that should have been compressed. # todo: use strftime? - my ($day,$month,$year) = (localtime(time()))[3,4,5]; + my ($day,$month,$year) = (gmtime(time()))[3,4,5]; my $date = sprintf("%04d%02d%02d",$year+1900,$month+1,$day); - opendir(DIR,"$bot_base_dir/log"); + if (!opendir(DIR,"$bot_log_dir")) { + &ERROR("misccheck2: log dir $bot_log_dir does not exist."); + closedir DIR; + return -1; + } + while (my $f = readdir(DIR)) { - next unless ( -f "$bot_base_dir/log/$f"); + next unless ( -f "$bot_log_dir/$f"); next if ($f =~ /gz|bz2/); next unless ($f =~ /(\d{8})/); next if ($date eq $1); - &compress("$bot_base_dir/log/$f"); + &compress("$bot_log_dir/$f"); } closedir DIR; } -sub shmFlush { - return if ($$ != $::bot_pid); # fork protection. - - if (@_) { - &ScheduleThis(5, "shmFlush"); - return if ($_[0] eq "2"); - } - - my $time; - my $shmmsg = &shmRead($shm); - $shmmsg =~ s/\0//g; # remove padded \0's. - if ($shmmsg =~ s/^(\d+): //) { - $time = $1; - } - - foreach (split '\|\|', $shmmsg) { - next if (/^$/); - &VERB("shm: Processing '$_'.",2); - - if (/^DCC SEND (\S+) (\S+)$/) { - my ($nick,$file) = ($1,$2); - if (exists $dcc{'SEND'}{$who}) { - &msg($nick, "DCC already active."); - } else { - &DEBUG("shm: dcc sending $2 to $1."); - $conn->new_send($1,$2); - $dcc{'SEND'}{$who} = time(); - } - } elsif (/^SET FORKPID (\S+) (\S+)/) { - $forked{$1}{PID} = $2; - } elsif (/^DELETE FORK (\S+)$/) { - delete $forked{$1}; - } elsif (/^EVAL (.*)$/) { - &DEBUG("evaling '$1'."); - eval $1; - } else { - &DEBUG("shm: unknown msg. ($_)"); - } - } - - &shmWrite($shm,"") if ($shmmsg ne ""); -} - ### this is semi-scheduled sub getNickInUse { if ($ident eq $param{'ircNick'}) { @@ -874,7 +849,8 @@ sub getNickInUse { } sub uptimeLoop { - return unless &IsChanConf("uptime"); + return if (!defined &uptimeWriteFile); +# return unless &IsChanConf("uptime"); if (@_) { &ScheduleThis(60, "uptimeLoop"); @@ -907,23 +883,25 @@ sub slashdotLoop { } ); } -sub freshmeatLoop { +sub plugLoop { + if (@_) { - &ScheduleThis(60, "freshmeatLoop"); + &ScheduleThis(60, "plugLoop"); return if ($_[0] eq "2"); } - my @chans = &ChanConfList("freshmeatAnnounce"); + my @chans = &ChanConfList("plugAnnounce"); return unless (scalar @chans); - &Forker("freshmeat", sub { - my $data = &Freshmeat::freshmeatAnnounce(); + &Forker("plug", sub { + my $line = &Plug::plugAnnounce(); + return unless (defined $line); foreach (@chans) { next unless (&::validChan($_)); - &::status("sending freshmeat update to $_."); - &msg($_, $data); + &::status("sending plug update to $_."); + ¬ice($_, "Plug: $line"); } } ); } @@ -1020,16 +998,21 @@ sub wingateWriteFile { sub factoidCheck { if (@_) { - &ScheduleThis(1440, "factoidCheck"); + &ScheduleThis(720, "factoidCheck"); return if ($_[0] eq "2"); # defer. } my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#"); - my $stale = &getChanConfDefault("factoidDeleteDelay", 30) *60*60*24; + my $stale = &getChanConfDefault("factoidDeleteDelay", 14) *60*60*24; + if ($stale < 1) { + # disable it since it's "illegal". + return; + } + my $time = time(); foreach (@list) { - my $age = &getFactInfo($_, "modified_time"); + my $age = &getFactInfo($_, "modified_time"); if (!defined $age or $age !~ /^\d+$/) { if (scalar @list > 50) { @@ -1040,7 +1023,7 @@ sub factoidCheck { } } - &WARN("old cruft (no time): $_"); + &WARN("del factoid: old cruft (no time): $_"); &delFactoid($_); next; } @@ -1049,11 +1032,11 @@ sub factoidCheck { my $fix = $_; $fix =~ s/ #DEL#$//g; - &DEBUG("safedel: Removing $fix ($_) for good."); + my $agestr = &Time2String($time - $age); + &status("safedel: Removing '$_' for good. [$agestr old]"); &delFactoid($_); } - } sub dccStatus { @@ -1064,7 +1047,7 @@ sub dccStatus { return if ($_[0] eq "2"); # defer. } - my $time = strftime("%H:%M", localtime(time()) ); + my $time = strftime("%H:%M", gmtime(time()) ); my $c; foreach (keys %channels) { @@ -1111,49 +1094,25 @@ sub scheduleList { &DEBUG("end of sList."); } -sub getChanConfDefault { - my($what, $default, $chan) = @_; - - if (exists $param{$what}) { - if (!exists $cache{config}{$what}) { - &status("conf: backward-compat: found param{$what} ($param{$what}) instead."); - $cache{config}{$what} = 1; - } - - return $param{$what}; - } - - my $val = &getChanConf($what, $chan); - if (defined $val) { - return $val; - } - - $param{$what} = $default; - &status("conf: auto-setting param{$what} = $default"); - $cache{config}{$what} = 1; - - return $default; -} - sub mkBackup { my($file, $time) = @_; my $backup = 0; if (! -f $file) { - &WARN("mkB: file '$file' does not exist."); + &VERB("mkB: file '$file' does not exist.",2); return; } + my $age = "New"; if ( -e "$file~" ) { - $backup++ if ((stat $file)[9] - (stat "$file~")[9] > $time); + $backup++ if ((stat $file)[9] - (stat "$file~")[9] > $time); + my $delta = time() - (stat "$file~")[9]; + $age = &Time2String($delta); } else { $backup++; } - return unless ($backup); - # should delta be time(file) - time(file~)? - my $delta = time() - (stat "$file~")[9]; - my $age = &Time2String($delta); + return unless ($backup); ### TODO: do internal copying. &status("Backup: $file ($age)");