X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FSchedulers.pl;h=d18a35dfdc1eebe1b3a736e60b63b236e2de09a3;hb=6347aa7bd7d649273a92c66190507cc7b41a6278;hp=b2dd6f9ab51c6730671ca3181eede12c42f7e4b7;hpb=66ce4d619091f642e37908c3b0ff56f1dda5ef5a;p=infobot.git diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index b2dd6f9..d18a35d 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, $chan); + 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 in " . &Time2String(time() - $time) . "."); + return; + } + + #&VERB("Scheduling \&$codename() for " . &Time2String($waittime),3); + + my $retval = $conn->schedule($waittime, sub { + \&$codename; + }, @args ); +} sub setupSchedulers { &VERB("Starting schedulers...",2); @@ -16,35 +56,37 @@ sub setupSchedulers { # ONCE OFF. # REPETITIVE. - # 1 for run straight away, 2 for on next-run. - &uptimeLoop(1); + # 2 for on next-run. &randomQuote(2); &randomFactoid(2); - &randomFreshmeat(2); - &logLoop(1); - &chanlimitCheck(1); - &netsplitCheck(1); # mandatory - &floodLoop(1); # mandatory &seenFlush(2); &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(1); - &newsFlush(1); + &factoidCheck(2); # takes a couple of seconds on a 486. defer it +# TODO: convert to new format... or nuke altogether. + &newsFlush(2); + # 1 for run straight away + &uptimeLoop(1); + &logLoop(1); + &chanlimitCheck(1); + &netsplitCheck(1); # mandatory + &floodLoop(1); # mandatory + &ignoreCheck(1); # mandatory + &miscCheck(1); # mandatory + &shmFlush(1); # mandatory + sleep 1; + &ircCheck(1); # mandatory + + # 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()); @@ -52,7 +94,7 @@ sub setupSchedulers { } &status("Schedulers: $count will be running."); -### &scheduleList(); + &scheduleList(); } sub ScheduleThis { @@ -66,11 +108,11 @@ sub ScheduleThis { my $time = $sched{$codename}{TIME}; if (defined $time and $time > time()) { - &WARN("Sched for $codename already exists."); + &WARN("Sched for $codename already exists in " . &Time2String(time() - $time) . "."); return; } -# &VERB("Scheduling \&$codename() for ".&Time2String($waittime),3); + &DEBUG("Scheduling \&$codename() " . \&$codename . " for " . &Time2String($waittime),3); my $retval = $conn->schedule($waittime, \&$codename, @args); $sched{$codename}{LABEL} = $retval; @@ -83,21 +125,21 @@ sub ScheduleThis { #### sub randomQuote { - my $interval = &getChanConfDefault("randomQuoteInterval", 60); + my $interval = &getChanConfDefault("randomQuoteInterval", 60, $chan); if (@_) { &ScheduleThis($interval, "randomQuote"); return if ($_[0] eq "2"); # defer. } - my $line = &getRandomLineFromFile($bot_data_dir. "/blootbot.randtext"); - if (!defined $line) { - &ERROR("random Quote: weird error?"); - return; - } - foreach ( &ChanConfList("randomQuote") ) { next unless (&validChan($_)); + my $line = &getRandomLineFromFile($bot_data_dir. "/blootbot.randtext"); + if (!defined $line) { + &ERROR("random Quote: weird error?"); + return; + } + &status("sending random Quote to $_."); &action($_, "Ponders: ".$line); } @@ -109,57 +151,34 @@ sub randomFactoid { my ($key,$val); my $error = 0; - my $interval = &getChanConfDefault("randomFactoidInterval", 60); + my $interval = &getChanConfDefault("randomFactoidInterval", 60, $chan); if (@_) { &ScheduleThis($interval, "randomFactoid"); return if ($_[0] eq "2"); # defer. } - while (1) { - ($key,$val) = &randKey("factoids","factoid_key,factoid_value"); -### $val =~ tr/^[A-Z]/[a-z]/; # blah is Good => blah is good. - last if (defined $val and $val !~ /^ blah is good. + last if ((defined $val) and ($val !~ /^ $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."); @@ -195,40 +214,38 @@ sub logLoop { } ### check if all the logs exceed size. - if (opendir(LOGS, $bot_log_dir)) { - my $tsize = 0; - my (%age, %size); - - while (defined($_ = readdir LOGS)) { - my $logfile = "$bot_log_dir/$_"; + 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 $bot_log_dir"); + 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 { @@ -242,13 +259,13 @@ sub seenFlushOld { return unless (&IsChanConf("seenFlushInterval") > 0); # global setting. does not make sense for per-channel. - my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24; + my $max_time = &getChanConfDefault("seenMaxDays", 30, $chan) *60*60*24; my $delete = 0; - if ($param{'DBType'} =~ /^pgsql|mysql/i) { + if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite(2)?)$/i) { my $query; - if ($param{'DBType'} =~ /^mysql$/i) { + if ($param{'DBType'} =~ /^(mysql|sqlite(2)?)$/i) { $query = "SELECT nick,time FROM seen GROUP BY nick HAVING ". "UNIX_TIMESTAMP() - time > $max_time"; } else { # pgsql. @@ -257,28 +274,17 @@ sub seenFlushOld { } my $sth = $dbh->prepare($query); - $sth->execute; + if ($sth->execute) { + while (my @row = $sth->fetchrow_array) { + my ($nick,$time) = @row; - while (my @row = $sth->fetchrow_array) { - my ($nick,$time) = @row; - - &dbDel("seen","nick",$nick); - $delete++; - } - $sth->finish; - } elsif ($param{'DBType'} =~ /^dbm/i) { - my $time = time(); - - foreach (keys %seen) { - my $delta_time = $time - &dbGet("seen", "time", "nick", $_); - next unless ($delta_time > $max_time); - - &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); @@ -290,7 +296,7 @@ sub newsFlush { return if ($_[0] eq "2"); # defer. } - if (!&ChanConfList("news")) { + if (!&ChanConfList('News')) { &DEBUG("newsFlush: news disabled? (chan => $chan)"); return; } @@ -324,7 +330,7 @@ sub newsFlush { next unless (time() > $t); - # todo: show how old it was. + # TODO: show how old it was. delete $::news{$chan}{$item}; &status("NEWS: (newsflush) deleted '$item'"); $delete++; @@ -335,7 +341,7 @@ sub newsFlush { $none{$chan} = 1 if ($total == $i); } - # todo: flush users aswell. + # TODO: flush users aswell. my $duser = 0; foreach $chan (keys %::newsuser) { next if (exists $none{$chan}); @@ -358,13 +364,13 @@ sub newsFlush { } if ($delete or $duser) { - &News::writeNews(); &status("NewsFlush: deleted: $delete news entries; $duser user cache."); } } sub chanlimitCheck { - my $interval = &getChanConfDefault("chanlimitcheckInterval", 10); + my $interval = &getChanConfDefault("chanlimitcheckInterval", 10, $chan); + my $mynick=$conn->nick(); if (@_) { &ScheduleThis($interval, "chanlimitCheck"); @@ -388,7 +394,7 @@ sub chanlimitCheck { if (scalar keys %netsplitservers) { if (defined $limit) { &status("chanlimit: netsplit; removing it for $chan."); - &rawout("MODE $chan -l"); + $conn->mode($chan, "-l"); $cache{chanlimitChange}{$chan} = time(); &status("chanlimit: netsplit; removed."); } @@ -397,7 +403,7 @@ sub chanlimitCheck { } 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. } @@ -406,8 +412,8 @@ sub chanlimitCheck { next; } - if (!exists $channels{$chan}{'o'}{$ident}) { - &status("ChanLimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan}); + if (!exists $channels{$chan}{'o'}{$mynick}) { + &status("chanlimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan}); $cache{warn}{chanlimit}{$chan} = 1; &chanServCheck($chan); next; @@ -415,18 +421,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("chanLimit: 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(); } } @@ -517,7 +523,7 @@ sub floodLoop { } my $time = time(); - my $interval = &getChanConfDefault("floodCycle",60); + my $interval = &getChanConfDefault("floodCycle",60, $chan); foreach $who (keys %flood) { foreach (keys %{ $flood{$who} }) { @@ -537,77 +543,27 @@ sub floodLoop { sub seenFlush { if (@_) { - my $interval = &getChanConfDefault("seenFlushInterval", 60); + my $interval = &getChanConfDefault("seenFlushInterval", 60, $chan); &ScheduleThis($interval, "seenFlush"); return if ($_[0] eq "2"); } my %stats; my $nick; - my $flushed = 0; + my $flushed = 0; $stats{'count_old'} = &countKeys("seen") || 0; $stats{'new'} = 0; $stats{'old'} = 0; - if ($param{'DBType'} =~ /^(mysql|pgsql)$/i) { - foreach $nick (keys %seencache) { - my $retval = &dbReplace("seen", "nick", ( - "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++; - - next; - - ### - ### old code. - ### - - my $exists = &dbGet("seen", "nick", "nick=".&dbQuote($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(2)?)$/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++; @@ -708,6 +664,9 @@ sub ignoreCheck { $count++; } } + + $cache{ignoreCheckTime} = time(); + &VERB("ignore: $count items deleted.",2); } @@ -717,54 +676,46 @@ sub ircCheck { return if ($_[0] eq "2"); # defer. } - 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; - &joinNextChan(); - } - - if (!$conn->connected or 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!"); - $msgtime = time(); # just in case. - &ircloop(); - delete $cache{connect}; - } else { - &status("IRCTEST: possible lost in space; checking. ". - scalar(localtime) ); - &msg($ident, "TEST"); - $cache{connect} = time(); + $cache{statusSafe} = 1; + foreach (sort keys %conns) { + $conn=$conns{$_}; + my $mynick=$conn->nick(); + &DEBUG("ircCheck for $_"); + my @join = &getJoinChans(1); + if (scalar @join) { + &FIXME('ircCheck: found channels to join! ' . join(',',@join)); + &joinNextChan(); } - } - if ($ident !~ /^\Q$param{ircNick}\E$/) { - # this does not work unfortunately. - &WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick})."); + # TODO: fix on_disconnect() - # this check is misleading... perhaps we should do a notify. - if (! &IsNickInAnyChan( $param{ircNick} ) ) { - &DEBUG("$param{ircNick} not in use... changing!"); - &nick( $param{ircNick} ); - } else { - &WARN("$param{ircNick} is still in use..."); + 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!"); + $msgtime = time(); # just in case. + &ircloop(); + delete $cache{connect}; + } else { + &status('ircCheck: possible lost in space; checking.'. + scalar(gmtime) ); + &msg($mynick, "TEST"); + $cache{connect} = time(); + } } - } - 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 (grep /^\s*$/, keys %channels) { + &WARN('ircCheck: we have a NULL chan in hash channels? removing!'); + if (!exists $channels{''}) { + &DEBUG('ircCheck: this should never happen!'); + } - delete $channels{''}; + delete $channels{''}; + } } + $cache{statusSafe} = 0; + ### USER FILE. if ($utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600) { &writeUserFile(); @@ -779,7 +730,7 @@ sub ircCheck { sub miscCheck { if (@_) { - &ScheduleThis(240, "miscCheck"); + &ScheduleThis(120, "miscCheck"); return if ($_[0] eq "2"); # defer. } @@ -792,6 +743,20 @@ sub miscCheck { return; } + # make backup of important files. + &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} + foreach (keys %{ $cache{lobotomy} }) { + next unless (time() - $cache{lobotomy}{$_} > 60*60); + delete $cache{lobotomy}{$_}; + } + + ### check modules if they've been modified. might be evil. + &reloadAllModules(); + # shmid stale remove. foreach (@ipcs) { chop; @@ -802,32 +767,23 @@ 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{ircUser} =~ /^\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"); CORE::system("/usr/bin/ipcrm shm $shmid >/dev/null"); } - - # make backup of important files. - &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} - foreach (keys %{ $cache{lobotomy} }) { - next unless (time() - $cache{lobotomy}{$_} > 60*60); - delete $cache{lobotomy}{$_}; - } - - ### check modules if they've been modified. might be evil. - &reloadAllModules(); } sub miscCheck2 { @@ -848,8 +804,8 @@ sub miscCheck2 { closedir DEBIAN; # compress logs that should have been compressed. - # todo: use strftime? - my ($day,$month,$year) = (localtime(time()))[3,4,5]; + # TODO: use strftime? + my ($day,$month,$year) = (gmtime(time()))[3,4,5]; my $date = sprintf("%04d%02d%02d",$year+1900,$month+1,$day); if (!opendir(DIR,"$bot_log_dir")) { @@ -869,70 +825,29 @@ sub miscCheck2 { 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'}) { - &status("okay, got my nick back."); - return; - } - - if (@_) { - &ScheduleThis(30, "getNickInUse"); - return if ($_[0] eq "2"); # defer. - } - - &nick( $param{'ircNick'} ); +# FIXME: broken for multiple connects +# if ($ident eq $param{'ircNick'}) { +# &status("okay, got my nick back."); +# return; +# } +# +# if (@_) { +# &ScheduleThis(30, "getNickInUse"); +# return if ($_[0] eq "2"); # defer. +# } +# +# &nick( $param{'ircNick'} ); } sub uptimeLoop { - return unless &IsChanConf("uptime"); + return if (!defined &uptimeWriteFile); +# return unless &IsParam('Uptime'); if (@_) { - &ScheduleThis(60, "uptimeLoop"); - return if ($_[0] eq "2"); # defer. + &ScheduleThis(60, 'uptimeLoop'); + return if ($_[0] eq '2'); # defer. } &uptimeWriteFile(); @@ -941,14 +856,14 @@ sub uptimeLoop { sub slashdotLoop { if (@_) { - &ScheduleThis(60, "slashdotLoop"); + &ScheduleThis(60, 'slashdotLoop'); return if ($_[0] eq "2"); } - my @chans = &ChanConfList("slashdotAnnounce"); + my @chans = &ChanConfList('slashdotAnnounce'); return unless (scalar @chans); - &Forker("slashdot", sub { + &Forker('slashdot', sub { my $line = &Slashdot::slashdotAnnounce(); return unless (defined $line); @@ -961,23 +876,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"); } } ); } @@ -991,7 +908,7 @@ sub kernelLoop { my @chans = &ChanConfList("kernelAnnounce"); return unless (scalar @chans); - &Forker("kernel", sub { + &Forker("Kernel", sub { my @data = &Kernel::kernelAnnounce(); foreach (@chans) { @@ -1007,14 +924,14 @@ sub kernelLoop { } sub wingateCheck { - return unless &IsChanConf("wingate"); + return unless &IsChanConf('Wingate'); ### FILE CACHE OF OFFENDING WINGATES. foreach (grep /^$host$/, @wingateBad) { &status("Wingate: RUNNING ON $host BY $who"); - &ban("*!*\@$host", "") if &IsChanConf("wingateBan"); + &ban("*!*\@$host", "") if &IsChanConf('wingateBan'); - my $reason = &getChanConf("wingateKick"); + my $reason = &getChanConf('wingateKick'); next unless ($reason); &kick($who, "", $reason) @@ -1028,21 +945,21 @@ sub wingateCheck { &DEBUG("Already scanned $host. good."); } - my $interval = &getChanConfDefault("wingateInterval", 60); # seconds. - return if (defined $forked{'wingate'}); + my $interval = &getChanConfDefault('wingateInterval', 60, $chan); # seconds. + return if (defined $forked{'Wingate'}); return if (time() - $wingaterun <= $interval); return unless (scalar(keys %wingateToDo)); $wingaterun = time(); - &Forker("wingate", sub { &Wingate::Wingates(keys %wingateToDo); } ); + &Forker('Wingate', sub { &Wingate::Wingates(keys %wingateToDo); } ); undef @wingateNow; } -### TODO. +### TODO: ?? sub wingateWriteFile { if (@_) { - &ScheduleThis(60, "wingateWriteFile"); + &ScheduleThis(60, 'wingateWriteFile'); return if ($_[0] eq "2"); # defer. } @@ -1050,7 +967,7 @@ sub wingateWriteFile { my $file = "$bot_base_dir/$param{'ircUser'}.wingate"; if ($bot_pid != $$) { - &DEBUG("wingateWriteFile: Reorganising!"); + &DEBUG('wingateWriteFile: Reorganising!'); open(IN, $file); while () { @@ -1064,7 +981,7 @@ sub wingateWriteFile { @wingateNow = sort keys %hash; } - &DEBUG("wingateWF: writing..."); + &DEBUG('wingateWF: writing...'); open(OUT, ">$file"); foreach (@wingateNow) { print OUT "$_\n"; @@ -1079,7 +996,7 @@ sub factoidCheck { } my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#"); - my $stale = &getChanConfDefault("factoidDeleteDelay", 14) *60*60*24; + my $stale = &getChanConfDefault("factoidDeleteDelay", 14, $chan) *60*60*24; if ($stale < 1) { # disable it since it's "illegal". return; @@ -1088,7 +1005,7 @@ sub factoidCheck { 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) { @@ -1123,7 +1040,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) { @@ -1147,51 +1064,29 @@ sub scheduleList { # b - weird time. ### - &DEBUG("sched:"); - foreach (keys %{ $irc->{_queue} }) { + my $reply = "sched:"; + foreach (keys %{ $irc->{_queue}}) { my $q = $_; - + my $coderef = $irc->{_queue}->{$q}->[1]; my $sched; foreach (keys %sched) { - next unless ($q eq $sched{$_}); - $sched = $_; + my $schedname = $_; + next unless defined(\&$schedname); + next unless ($coderef eq \&$schedname); + $sched = $schedname; last; } my $time = $irc->{_queue}->{$q}->[0] - time(); if (defined $sched) { - &DEBUG(" $sched($q): ".&Time2String($time) ); + $reply = "$reply, $sched($q):" . &Time2String($time); } else { - &DEBUG(" NULL($q): ".&Time2String($time) ); + $reply = "$reply, NULL($q):" . &Time2String($time); } } - &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; + &DEBUG("$reply"); } sub mkBackup {