X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FSchedulers.pl;h=5851b642c40fd8b996759cd500800533ad991ad6;hb=e893f2f9724bfe64f537272c2315b0393ccd1c32;hp=c1d49758600466863e781fd671d7b23714c2335b;hpb=72cb79f831e3eeae074a0ffe72bba17dd502341c;p=infobot.git diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index c1d4975..5851b64 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -10,42 +10,43 @@ if (&IsParam("useStrict")) { use strict; } use POSIX qw(strftime); use vars qw(%sched); -# -# is there a point in ScheduleChecked()? -# not yet... not unless we run setupSchedulers more than once. -# - sub setupSchedulers { &VERB("Starting schedulers...",2); # ONCE OFF. # REPETITIVE. - &uptimeCycle(1); + # 1 for run straight away, 2 for on next-run. + &uptimeLoop(1); &randomQuote(2); &randomFactoid(2); &randomFreshmeat(2); - &logCycle(1); + &logLoop(1); &chanlimitCheck(1); &netsplitCheck(1); # mandatory - &floodCycle(1); # mandatory - &seenFlush(1); - &leakCheck(1); # mandatory + &floodLoop(1); # mandatory + &seenFlush(2); + &leakCheck(2); # mandatory &ignoreCheck(1); # mandatory - &seenFlushOld(1); - &ircCheck(1); # mandatory + &seenFlushOld(2); + &ircCheck(2); # mandatory &miscCheck(1); # mandatory + &miscCheck2(2); # mandatory &shmFlush(1); # mandatory - &slashdotCycle(2); - &freshmeatCycle(2); - &kernelCycle(2); - &wingateWriteFile(1); - &factoidCheck(1); - -# my $count = map { exists $sched{$_}{RUNNING} } keys %sched; + &slashdotLoop(2); + &freshmeatLoop(2); + &kernelLoop(2); + &wingateWriteFile(2); + &factoidCheck(2); + &newsFlush(1); + +# my $count = map { exists $sched{$_}{TIME} } keys %sched; my $count = 0; foreach (keys %sched) { - next unless (exists $sched{$_}{RUNNING}); +# next unless (exists $sched{$_}{TIME}); + my $time = $sched{$_}{TIME}; + next unless (defined $time and $time > time()); + $count++; } @@ -62,39 +63,32 @@ sub ScheduleThis { return; } - if (exists $sched{$codename}) { + my $time = $sched{$codename}{TIME}; + if (defined $time and $time > time()) { &WARN("Sched for $codename already exists."); return; } - &VERB("Scheduling \&$codename() for ".&Time2String($waittime),3); +# &VERB("Scheduling \&$codename() for ".&Time2String($waittime),3); + my $retval = $conn->schedule($waittime, \&$codename, @args); $sched{$codename}{LABEL} = $retval; $sched{$codename}{TIME} = time()+$waittime; $sched{$codename}{RUNNING} = 1; } -sub ScheduleChecked { - my ($codename) = shift; - - # what the hell is this for? - if (exists $sched{$codename}{RUNNING}) { - &DEBUG("SC: Removed $codename."); - delete $sched{$codename}{RUNNING}; - } else { -### &WARN("sched $codename already removed."); - } -} - #### #### LET THE FUN BEGIN. #### sub randomQuote { - my $interval = $param{'randomQuoteInterval'} || 60; - &ScheduleThis($interval, "randomQuote") if (@_); - &ScheduleChecked("randomQuote"); - return if ($_[0] eq "2"); # defer. + my $interval = &getChanConfDefault("randomQuoteInterval", 60); + if (@_) { + &ScheduleThis($interval, "randomQuote"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"randomQuote"}{RUNNING}; + } my $line = &getRandomLineFromFile($bot_misc_dir. "/blootbot.randtext"); if (!defined $line) { @@ -103,7 +97,7 @@ sub randomQuote { } foreach ( &ChanConfList("randomQuote") ) { - next unless (&validChan($_)); # ??? + next unless (&validChan($_)); &status("sending random Quote to $_."); &action($_, "Ponders: ".$line); @@ -116,15 +110,19 @@ sub randomFactoid { my ($key,$val); my $error = 0; - my $interval = $param{'randomFactoidInterval'} || 60; # FIXME. - &ScheduleThis($interval, "randomFactoid") if (@_); - &ScheduleChecked("randomFactoid"); - return if ($_[0] eq "2"); # defer. + my $interval = &getChanConfDefault("randomFactoidInterval", 60); + if (@_) { + &ScheduleThis($interval, "randomFactoid"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"randomFactoid"}{RUNNING}; + } while (1) { ($key,$val) = &randKey("factoids","factoid_key,factoid_value"); ### $val =~ tr/^[A-Z]/[a-z]/; # blah is Good => blah is good. - last if ($val !~ /^ 0); return unless (&IsChanConf("seenFlushInterval") > 0); - my $max_time = ($chanconf{_default}{'seenMaxDays'} || 30) - *60*60*24; # global. + # global setting. does not make sense for per-channel. + my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24; my $delete = 0; if ($param{'DBType'} =~ /^pg|postgres|mysql/i) { @@ -281,35 +285,110 @@ sub seenFlushOld { } +sub newsFlush { + if (@_) { + &ScheduleThis(1440, "newsFlush"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"newsFlush"}{RUNNING}; + } + + return unless (&IsChanConf("news") > 0); + + my $delete = 0; + my $oldest = time(); + foreach $chan (keys %::news) { + foreach $item (keys %{ $::news{$chan} }) { + my $t = $::news{$chan}{$item}{Expire}; + + my $tadd = $::news{$chan}{$item}{Time}; + $oldest = $tadd if ($oldest > $tadd); + + next if ($t == 0 or $t == -1); + if ($t < 1000) { + &status("newsFlush: Fixed Expire time for $chan/$item, should not happen anyway."); + $::news{$chan}{$item}{Expire} = time() + $t*60*60*24; + next; + } + + next unless (time() > $t); + # todo: show how old it was. + delete $::news{$chan}{$item}; + &VERB("NEWS: deleted '$item'", 2); + $delete++; + } + } + + # todo: flush users aswell. + my $duser = 0; + foreach $chan (keys %::newsuser) { + foreach (keys %{ $::newsuser{$chan} }) { + my $t = $::newsuser{$chan}{$_}; + if (!defined $t or ($t > 2 and $t < 1000)) { + &DEBUG("something wrong with newsuser{$chan}{$_} => $t"); + next; + } + + next unless ($oldest > $t); + + delete $::newsuser{$chan}{$_}; + $duser++; + } + } + +# &VERB("NEWS deleted $delete seen entries.",2); + &status("NEWS deleted: $delete news entries; $duser user cache."); + + &News::writeNews(); +} + sub chanlimitCheck { + my $interval = &getChanConfDefault("chanlimitcheckInterval", 10); + if (@_) { - my $interval = &getChanConf("chanlimitcheckInterval") || 10; &ScheduleThis($interval, "chanlimitCheck"); - &ScheduleChecked("chanlimitCheck"); return if ($_[0] eq "2"); + } else { + delete $sched{"chanlimitCheck"}{RUNNING}; } - foreach ( &ChanConfList("chanlimitcheck") ) { - next unless (&validChan($_)); # ??? + foreach $chan ( &ChanConfList("chanlimitcheck") ) { + next unless (&validChan($chan)); - my $limitplus = &getChanConf("chanlimitcheckPlus",$_) || 5; - my $newlimit = scalar(keys %{$channels{$_}{''}}) + $limitplus; - my $limit = $channels{$_}{'l'}; + my $limitplus = &getChanConfDefault("chanlimitcheckPlus", 5, $chan); + my $newlimit = scalar(keys %{ $channels{$chan}{''} }) + $limitplus; + my $limit = $channels{$chan}{'l'}; - if (scalar keys %{$channels{$_}{''}} > $limit) { - &status("LIMIT: set too low!!! FIXME"); + if (defined $limit and scalar keys %{ $channels{$chan}{''} } > $limit) { + &FIXME("LIMIT: set too low!!! FIXME"); ### run NAMES again and flush it. } next unless (!defined $limit or $limit != $newlimit); - if (!exists $channels{$_}{'o'}{$ident}) { - &ERROR("chanlimitcheck: dont have ops on $_."); + if (!exists $channels{$chan}{'o'}{$ident}) { + &status("ChanLimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan}); + $cache{warn}{chanlimit}{$chan} = 1; + &chanServCheck($chan); next; } - &rawout("MODE $_ +l $newlimit"); - } + delete $cache{warn}{chanlimit}{$chan}; + if (!defined $limit) { + &status("ChanLimit: setting for first time or from netsplit, for $chan"); + } + + if (exists $cache{chanlimitChange}{$chan}) { + my $delta = time() - $cache{chanlimitChange}{$chan}; + if ($delta < $interval*60) { + &DEBUG("not going to change chanlimit! ($delta<$interval*60)"); + return; + } + } + + &rawout("MODE $chan +l $newlimit"); + $cache{chanlimitChange}{$chan} = time(); + } } sub netsplitCheck { @@ -317,12 +396,13 @@ sub netsplitCheck { if (@_) { &ScheduleThis(30, "netsplitCheck"); - &ScheduleChecked("netsplitCheck"); return if ($_[0] eq "2"); + } else { + delete $sched{"netsplitCheck"}{RUNNING}; } foreach $s1 (keys %netsplitservers) { - foreach $s2 (keys %{$netsplitservers{$s1}}) { + foreach $s2 (keys %{ $netsplitservers{$s1} }) { if (time() - $netsplitservers{$s1}{$s2} > 3600) { &status("netsplit between $s1 and $s2 appears to be stale."); delete $netsplitservers{$s1}{$s2}; @@ -331,33 +411,42 @@ sub netsplitCheck { } # %netsplit hash checker. + my $count = scalar keys %netsplit; foreach (keys %netsplit) { if (&IsNickInAnyChan($_)) { &DEBUG("netsplitC: $_ is in some chan; removing from netsplit list."); delete $netsplit{$_}; + next; } - next unless (time() - $netsplit{$_} > 60*60*2); # 2 hours. - next if (&IsNickInAnyChan($_)); + next unless (time() - $netsplit{$_} > 60*10); - &DEBUG("netsplitC: $_ didn't come back from netsplit in 2 hours; removing from netsplit list."); + &DEBUG("netsplitC: $_ didn't come back from netsplit; removing from netsplit list."); delete $netsplit{$_}; } + + if ($count and !scalar keys %netsplit) { + &DEBUG("ok, netsplit is hopefully gone. reinstating chanlimit check."); + &chanlimitCheck(); + } } -sub floodCycle { +sub floodLoop { my $delete = 0; my $who; if (@_) { - &ScheduleThis(60, "floodCycle"); # minutes. - &ScheduleChecked("floodCycle"); + &ScheduleThis(60, "floodLoop"); # minutes. return if ($_[0] eq "2"); + } else { + delete $sched{"floodLoop"}{RUNNING}; } - my $time = time(); + my $time = time(); + my $interval = &getChanConfDefault("floodCycle",60); + foreach $who (keys %flood) { - foreach (keys %{$flood{$who}}) { - if (!exists $flood{$who}{$_} or defined $flood{$who}{$_}) { + foreach (keys %{ $flood{$who} }) { + if (!exists $flood{$who}{$_}) { &WARN("flood{$who}{$_} undefined?"); next; } @@ -368,27 +457,44 @@ sub floodCycle { } } } - &VERB("floodCycle: deleted $delete items.",2); - + &VERB("floodLoop: deleted $delete items.",2); } sub seenFlush { + if (@_) { + my $interval = &getChanConfDefault("seenFlushInterval", 60); + &ScheduleThis($interval, "seenFlush"); + return if ($_[0] eq "2"); + } else { + delete $sched{"seenFlush"}{RUNNING}; + } + my %stats; my $nick; my $flushed = 0; - $stats{'count_old'} = &countKeys("seen"); + $stats{'count_old'} = &countKeys("seen") || 0; $stats{'new'} = 0; $stats{'old'} = 0; - if (@_) { - my $interval = $param{'seenFlushInterval'} || 60; - &ScheduleThis($interval, "seenFlush"); - &ScheduleChecked("seenFlush"); - return if ($_[0] eq "2"); - } - if ($param{'DBType'} =~ /^mysql|pg|postgres/i) { foreach $nick (keys %seencache) { + if (0) { + #BROKEN# + 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'}, + ) ); + &DEBUG("retval => $retval."); + delete $seencache{$nick}; + $flushed++; + + next; + } + ### OLD CODE... + my $exists = &dbGet("seen","nick", $nick, "nick"); if (defined $exists and $exists) { @@ -440,14 +546,13 @@ sub seenFlush { &status("Flushed $flushed seen entries.") if ($flushed); &VERB(sprintf(" new seen: %03.01f%% (%d/%d)", - $stats{'new'}*100/$stats{'count_old'}, + $stats{'new'}*100/($stats{'count_old'} || 1), $stats{'new'}, $stats{'count_old'} ), 2) if ($stats{'new'}); &VERB(sprintf(" now seen: %3.1f%% (%d/%d)", $stats{'old'}*100/&countKeys("seen"), $stats{'old'}, &countKeys("seen") ), 2) if ($stats{'old'}); &WARN("scalar keys seenflush != 0!") if (scalar keys %seenflush); - } sub leakCheck { @@ -455,32 +560,65 @@ sub leakCheck { my $count = 0; if (@_) { - &ScheduleThis(60, "leakCheck"); - &ScheduleChecked("leakCheck"); + &ScheduleThis(240, "leakCheck"); return if ($_[0] eq "2"); + } else { + delete $sched{"leakCheck"}{RUNNING}; } # flood. foreach $blah1 (keys %flood) { - foreach $blah2 (keys %{$flood{$blah1}}) { - $count += scalar(keys %{$flood{$blah1}{$blah2}}); + foreach $blah2 (keys %{ $flood{$blah1} }) { + $count += scalar(keys %{ $flood{$blah1}{$blah2} }); } } - &VERB("\%flood has $count total keys.",2); + &DEBUG("leak: hash flood has $count total keys.",2); + + # floodjoin. + $count = 0; + foreach $blah1 (keys %floodjoin) { + foreach $blah2 (keys %{ $floodjoin{$blah1} }) { + $count += scalar(keys %{ $floodjoin{$blah1}{$blah2} }); + } + } + &DEBUG("leak: hash flood has $count total keys.",2); + + # floodwarn. + $count = scalar(keys %floodwarn); + &DEBUG("leak: hash floodwarn has $count total keys.",2); my $chan; foreach $chan (grep /[A-Z]/, keys %channels) { &DEBUG("leak: chan => '$chan'."); my ($i,$j); - foreach $i (keys %{$channels{$chan}}) { - foreach (keys %{$channels{$chan}{$i}}) { + foreach $i (keys %{ $channels{$chan} }) { + foreach (keys %{ $channels{$chan}{$i} }) { &DEBUG("leak: \$channels{$chan}{$i}{$_} ..."); } } } + + my $delete = 0; + foreach (keys %nuh) { + next if (&IsNickInAnyChan($_)); + next if (exists $dcc{CHAT}{$_}); + + delete $nuh{$_}; + $delete++; + } + + &status("leak: $delete nuh{} items deleted; now have ". + scalar(keys %nuh) ) if ($delete); } sub ignoreCheck { + if (@_) { + &ScheduleThis(60, "ignoreCheck"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"ignoreCheck"}{RUNNING}; + } + my $time = time(); my $count = 0; @@ -488,14 +626,9 @@ sub ignoreCheck { my $chan = $_; foreach (keys %{ $ignore{$chan} }) { - my @array = $ignore{$chan}{$_}; - - foreach (@array) { - &DEBUG(" => $_"); - } + my @array = @{ $ignore{$chan}{$_} }; - next; - next unless ($time > $ignore{$_}); + next unless ($array[0] and $time > $array[0]); delete $ignore{$chan}{$_}; &status("ignore: $_/$chan has expired."); @@ -503,11 +636,16 @@ sub ignoreCheck { } } &VERB("ignore: $count items deleted.",2); - - &ScheduleThis(60, "ignoreCheck") if (@_); } sub ircCheck { + if (@_) { + &ScheduleThis(60, "ircCheck"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"ircCheck"}{RUNNING}; + } + my @array = grep !/^_default$/, keys %chanconf; my $iconf = scalar(@array); my $inow = scalar(keys %channels); @@ -515,29 +653,50 @@ sub ircCheck { &FIXME("ircCheck: current channels * 2 <= config channels. FIXME."); } - if (!$conn->connected and time - $msgtime > 3600) { - &WARN("ircCheck: no msg for 3600 and disco'd! reconnecting!"); - $msgtime = time(); # just in case. - &ircloop(); + 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(); + } } if ($ident !~ /^\Q$param{ircNick}\E$/) { + # this does not work unfortunately. &WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick})."); - } - &joinNextChan(); - # if scalar @joinnext => join more channels - # else check for chanserv. + # 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 (grep /^\s*$/, keys %channels) { - &WARN("we have a NULL chan in hash channels? removing!"); - delete $channels{''}; - &status("channels now:"); - foreach (keys %channels) { - &status(" $_"); + &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!"); } + + delete $channels{''}; } + &DEBUG("ircstats..."); + &DEBUG(" pubsleep: $pubsleep"); + &DEBUG(" msgsleep: $msgsleep"); + &DEBUG(" notsleep: $notsleep"); + ### USER FILE. if ($utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600) { &writeUserFile(); @@ -548,12 +707,15 @@ sub ircCheck { &writeChanFile(); $wtime_chanfile = time(); } - - &ScheduleThis(240, "ircCheck") if (@_); } sub miscCheck { - &ScheduleThis(240, "miscCheck") if (@_); + if (@_) { + &ScheduleThis(240, "miscCheck"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"miscCheck"}{RUNNING}; + } # SHM check. my @ipcs; @@ -573,34 +735,98 @@ sub miscCheck { my ($shmid, $size) = ($2,$5); next unless ($shmid != $shm and $size == 2000); + my $z = &shmRead($shmid); + if ($z =~ /^(\d+): /) { + my $time = $1; + next if (time() - $time < 60*60); + + } else { +# &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"); + } -### &status("SHM: nuking shmid $shmid"); -### system("/usr/bin/ipcrm shm $shmid >/dev/null"); + # 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_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 { + if (@_) { + &ScheduleThis(240, "miscCheck2"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"miscCheck2"}{RUNNING}; + } + + &DEBUG("miscCheck2: Doing debian checking..."); + + # debian check. + opendir(DEBIAN, "$bot_base_dir/debian"); + foreach ( grep /gz$/, readdir(DEBIAN) ) { + my $exit = CORE::system("gzip -t $bot_base_dir/debian/$_"); + next unless ($exit); + + &status("debian: unlinking file => $_"); + unlink "$bot_base_dir/debian/$_"; + } + closedir DEBIAN; + + # compress logs that should have been compressed. + # todo: use strftime? + my ($day,$month,$year) = (localtime(time()))[3,4,5]; + my $date = sprintf("%04d%02d%02d",$year+1900,$month+1,$day); + + opendir(DIR,"$bot_base_dir/log"); + while (my $f = readdir(DIR)) { + next unless ( -f "$bot_base_dir/log/$f"); + next if ($f =~ /gz|bz2/); + next unless ($f =~ /(\d{8})/); + next if ($date eq $1); + + &compress("$bot_base_dir/log/$f"); + } + closedir DIR; +} + sub shmFlush { + return if ($$ != $::bot_pid); # fork protection. + if (@_) { &ScheduleThis(5, "shmFlush"); - &ScheduleChecked("shmFlush"); return if ($_[0] eq "2"); + } else { + delete $sched{"shmFlush"}{RUNNING}; } + my $time; my $shmmsg = &shmRead($shm); $shmmsg =~ s/\0//g; # remove padded \0's. - - return if ($$ != $::bot_pid); # fork protection. + 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."); + &msg($nick, "DCC already active."); } else { &DEBUG("shm: dcc sending $2 to $1."); $conn->new_send($1,$2); @@ -628,45 +854,62 @@ sub getNickInUse { return; } - &status("Trying to get my nick back."); - &nick($param{'ircNick'}); + if (@_) { + &ScheduleThis(30, "getNickInUse"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"getNickInUse"}{RUNNING}; + } - &ScheduleThis(5, "getNickInUse") if (@_); + &status("Trying to get my nick back."); + &nick( $param{'ircNick'} ); } -sub uptimeCycle { - &uptimeWriteFile(); +sub uptimeLoop { + return unless &IsChanConf("uptime"); + + if (@_) { + &ScheduleThis(60, "uptimeLoop"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"uptimeLoop"}{RUNNING}; + } - &ScheduleThis(60, "uptimeCycle") if (@_); + &uptimeWriteFile(); } -sub slashdotCycle { - &ScheduleThis(60, "slashdotCycle") if (@_); - &ScheduleChecked("slashdotCycle"); - return if ($_[0] eq "2"); +sub slashdotLoop { + + if (@_) { + &ScheduleThis(60, "slashdotLoop"); + return if ($_[0] eq "2"); + } else { + delete $sched{"slashdotLoop"}{RUNNING}; + } my @chans = &ChanConfList("slashdotAnnounce"); return unless (scalar @chans); &Forker("slashdot", sub { - my @data = &Slashdot::slashdotAnnounce(); + my $line = &Slashdot::slashdotAnnounce(); + return unless (defined $line); foreach (@chans) { next unless (&::validChan($_)); &::status("sending slashdot update to $_."); - my $c = $_; - foreach (@data) { - ¬ice($c, "Slashdot: $_"); - } + ¬ice($_, "Slashdot: $line"); } } ); } -sub freshmeatCycle { - &ScheduleThis(60, "freshmeatCycle") if (@_); - &ScheduleChecked("freshmeatCycle"); - return if ($_[0] eq "2"); +sub freshmeatLoop { + if (@_) { + &ScheduleThis(60, "freshmeatLoop"); + return if ($_[0] eq "2"); + } else { + delete $sched{"freshmeatLoop"}{RUNNING}; + } my @chans = &ChanConfList("freshmeatAnnounce"); return unless (scalar @chans); @@ -683,10 +926,13 @@ sub freshmeatCycle { } ); } -sub kernelCycle { - &ScheduleThis(240, "kernelCycle") if (@_); - &ScheduleChecked("kernelCycle"); - return if ($_[0] eq "2"); +sub kernelLoop { + if (@_) { + &ScheduleThis(240, "kernelLoop"); + return if ($_[0] eq "2"); + } else { + delete $sched{"kernelLoop"}{RUNNING}; + } my @chans = &ChanConfList("kernelAnnounce"); return unless (scalar @chans); @@ -707,16 +953,17 @@ sub kernelCycle { } sub wingateCheck { - return unless &IsParam("wingate"); - return unless ($param{'wingate'} =~ /^(.*\s+)?$chan(\s+.*)?$/i); + return unless &IsChanConf("wingate"); ### FILE CACHE OF OFFENDING WINGATES. foreach (grep /^$host$/, @wingateBad) { &status("Wingate: RUNNING ON $host BY $who"); - &ban("*!*\@$host", "") if &IsParam("wingateBan"); + &ban("*!*\@$host", "") if &IsChanConf("wingateBan"); + + my $reason = &getChanConf("wingateKick"); - next unless (&IsParam("wingateKick")); - &kick($who, "", $param{'wingateKick'}) + next unless ($reason); + &kick($who, "", $reason) } ### RUN CACHE OF TRIED WINGATES. @@ -727,7 +974,7 @@ sub wingateCheck { &DEBUG("Already scanned $host. good."); } - my $interval = $param{'wingateInterval'} || 60; # seconds. + my $interval = &getChanConfDefault("wingateInterval", 60); # seconds. return if (defined $forked{'wingate'}); return if (time() - $wingaterun <= $interval); return unless (scalar(keys %wingateToDo)); @@ -740,6 +987,13 @@ sub wingateCheck { ### TODO. sub wingateWriteFile { + if (@_) { + &ScheduleThis(60, "wingateWriteFile"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"wingateWriteFile"}{RUNNING}; + } + return unless (scalar @wingateCache); my $file = "$bot_base_dir/$param{'ircUser'}.wingate"; @@ -765,41 +1019,73 @@ sub wingateWriteFile { } close OUT; - &ScheduleThis(60, "wingateWriteFile") if (@_); } sub factoidCheck { - my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#"); - my $stale = ($param{'factoidDeleteDelay'} || 7)*60*60*24; + if (@_) { + &ScheduleThis(1440, "factoidCheck"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"factoidCheck"}{RUNNING}; + } + + my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#"); + my $stale = &getChanConfDefault("factoidDeleteDelay", 30) *60*60*24; + my $time = time(); foreach (@list) { my $age = &getFactInfo($_, "modified_time"); - next unless (time() - $age > $stale); + + if (!defined $age or $age !~ /^\d+$/) { + if (scalar @list > 50) { + if (!$cache{warnDel}) { + &WARN("list is over 50 (".scalar(@list)."... giving it a miss."); + $cache{warnDel} = 1; + last; + } + } + + &WARN("old cruft (no time): $_"); + &delFactoid($_); + next; + } + + next unless ($time - $age > $stale); my $fix = $_; $fix =~ s/ #DEL#$//g; - &VERB("safedel: Removing $fix for good.",2); + &DEBUG("safedel: Removing $fix ($_) for good."); + &delFactoid($_); } - &ScheduleThis(1440, "factoidCheck") if (@_); } sub dccStatus { - my $time = strftime("%H:%M", localtime(time()) ); - - return unless (scalar keys %{ $DCC{CHAT} }); + return unless (scalar keys %{ $dcc{CHAT} }); - foreach (keys %channels) { - &DCCBroadcast("[$time] $_: $users members ($chops chops), $bans bans","+o"); + if (@_) { + &ScheduleThis(10, "dccStatus"); + return if ($_[0] eq "2"); # defer. + } else { + delete $sched{"dccStatus"}{RUNNING}; } - &ScheduleThis(10, "dccStatus") if (@_); -} - -sub schedulerSTUB { + my $time = strftime("%H:%M", localtime(time()) ); - &ScheduleThis(TIME_IN_MINUTES, "FUNCTION") if (@_); + my $c; + foreach (keys %channels) { + my $c = $_; + my $users = keys %{ $channels{$c}{''} }; + my $chops = keys %{ $channels{$c}{o} }; + my $bans = keys %{ $channels{$c}{b} }; + + my $txt = "[$time] $c: $users members ($chops chops), $bans bans"; + foreach (keys %{ $dcc{'CHAT'} }) { + next unless (exists $channels{$c}{''}{lc $_}); + $conn->privmsg($dcc{'CHAT'}{$_}, $txt); + } + } } sub scheduleList { @@ -833,9 +1119,14 @@ sub scheduleList { } sub getChanConfDefault { - my($what, $chan, $default) = @_; + 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}; } @@ -843,9 +1134,33 @@ sub getChanConfDefault { if (defined $val) { return $val; } - &DEBUG("returning default $default for $what"); - ### TODO: set some vars? + + $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 don't exist."); + return; + } + + if ( -e "$file~" ) { + $backup++ if ((stat $file)[9] - (stat "$file~")[9] > $time); + } else { + $backup++; + } + return unless ($backup); + + ### TODO: do internal copying. + &status("Backup: $file to $file~"); + CORE::system("/bin/cp $file $file~"); +} + 1;