&leakCheck(2); # mandatory
&ignoreCheck(1); # mandatory
&seenFlushOld(2);
- &ircCheck(1); # mandatory
+ &ircCheck(2); # mandatory
&miscCheck(1); # mandatory
&miscCheck2(2); # mandatory
&shmFlush(1); # mandatory
&freshmeatLoop(2);
&kernelLoop(2);
&wingateWriteFile(2);
- &factoidCheck(2);
+ &factoidCheck(1);
&newsFlush(1);
# my $count = map { exists $sched{$_}{TIME} } keys %sched;
my $retval = $conn->schedule($waittime, \&$codename, @args);
$sched{$codename}{LABEL} = $retval;
$sched{$codename}{TIME} = time()+$waittime;
- $sched{$codename}{RUNNING} = 1;
+ $sched{$codename}{LOOP} = 1;
}
####
if (@_) {
&ScheduleThis($interval, "randomQuote");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"randomQuote"}{RUNNING};
}
my $line = &getRandomLineFromFile($bot_misc_dir. "/blootbot.randtext");
if (@_) {
&ScheduleThis($interval, "randomFactoid");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"randomFactoid"}{RUNNING};
}
while (1) {
if (@_) {
&ScheduleThis($interval, "randomFreshmeat");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"randomFreshmeat"}{RUNNING};
}
my @chans = &ChanConfList("randomFreshmeat");
if (@_) {
&ScheduleThis(60, "logLoop");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"logLoop"}{RUNNING};
}
return unless (defined fileno LOG);
if (@_) {
&ScheduleThis(1440, "seenFlushOld");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"seenFlushOld"}{RUNNING};
}
# is this global-only?
sub newsFlush {
if (@_) {
- &ScheduleThis(1440, "newsFlush");
+ &ScheduleThis(60, "newsFlush");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"newsFlush"}{RUNNING};
}
- return unless (&IsChanConf("news") > 0);
+ if (&ChanConfList("news")) {
+ } else {
+ &DEBUG("newsFlush: news disabled? (chan => $chan)");
+ return;
+ }
my $delete = 0;
my $oldest = time();
+ my %none;
foreach $chan (keys %::news) {
+ my $i = 0;
+ my $total = scalar(keys %{ $::news{$chan} });
+
+ &DEBUG("newsFlush: chan => $chan (total => $total)");
+
foreach $item (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$item}{Expire};
next;
}
+ my $delta = $t - time();
+
next unless (time() > $t);
+
# todo: show how old it was.
delete $::news{$chan}{$item};
- &VERB("NEWS: deleted '$item'", 2);
+ &status("NEWS: (newsflush) deleted '$item'");
$delete++;
+ $i++;
}
+
+ &status("NEWS (newsflush) {$chan}: deleted [$i/$total] news entries.");
+ $none{$chan} = 1 if ($total == $i);
}
# todo: flush users aswell.
my $duser = 0;
foreach $chan (keys %::newsuser) {
+ next if (exists $none{$chan});
+
foreach (keys %{ $::newsuser{$chan} }) {
my $t = $::newsuser{$chan}{$_};
if (!defined $t or ($t > 2 and $t < 1000)) {
delete $::newsuser{$chan}{$_};
$duser++;
}
- }
-# &VERB("NEWS deleted $delete seen entries.",2);
- &status("NEWS deleted: $delete news entries; $duser user cache.");
+ my $i = scalar(keys %{ $::newsuser{$chan} });
+ delete $::newsuser{$chan} unless ($i);
+ }
- &News::writeNews();
+ if ($delete or $duser) {
+ &DEBUG("newsF: Writing news.");
+ &News::writeNews();
+ &status("NEWS (newsflush) deleted: $delete news entries; $duser user cache.");
+ }
}
sub chanlimitCheck {
if (@_) {
&ScheduleThis($interval, "chanlimitCheck");
return if ($_[0] eq "2");
- } else {
- delete $sched{"chanlimitCheck"}{RUNNING};
}
foreach $chan ( &ChanConfList("chanlimitcheck") ) {
next unless (&validChan($chan));
my $limitplus = &getChanConfDefault("chanlimitcheckPlus", 5, $chan);
- my $newlimit = scalar(keys %{$channels{$chan}{''}}) + $limitplus;
+ my $newlimit = scalar(keys %{ $channels{$chan}{''} }) + $limitplus;
my $limit = $channels{$chan}{'l'};
- if (defined $limit and scalar keys %{$channels{$chan}{''}} > $limit) {
+ if (scalar keys %netsplitservers) {
+ if (defined $limit) {
+ &DEBUG("chanlimit: removing it for $chan.");
+ &rawout("MODE $chan -l");
+ $cache{chanlimitChange}{$chan} = time();
+ }
+
+ next;
+ }
+
+ 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);
+ 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});
$cache{warn}{chanlimit}{$chan} = 1;
- ### TODO: check chanserv?
+ &chanServCheck($chan);
next;
}
delete $cache{warn}{chanlimit}{$chan};
&status("ChanLimit: setting for first time or from netsplit, for $chan");
}
- if (exists $cache{chanlimitChange_$chan}) {
- if (time() - $cache{chanlimitChange_$chan} < 60) {
- &DEBUG("not going to change chanlimit!");
+ 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;
}
- delete $cache{chanlimitChange_$chan};
}
&rawout("MODE $chan +l $newlimit");
- $cache{chanlimitChange_$chan} = time();
+ $cache{chanlimitChange}{$chan} = time();
}
}
if (@_) {
&ScheduleThis(30, "netsplitCheck");
return if ($_[0] eq "2");
- } else {
- delete $sched{"netsplitCheck"}{RUNNING};
}
+ &DEBUG("running netsplitCheck...");
+
foreach $s1 (keys %netsplitservers) {
- foreach $s2 (keys %{$netsplitservers{$s1}}) {
+ &DEBUG("nsC: s1 => $s1");
+
+ foreach $s2 (keys %{ $netsplitservers{$s1} }) {
+ my $delta = time() - $netsplitservers{$s1}{$s2};
+ &DEBUG("nss{$s1}{$s2} = $delta");
+
if (time() - $netsplitservers{$s1}{$s2} > 3600) {
&status("netsplit between $s1 and $s2 appears to be stale.");
delete $netsplitservers{$s1}{$s2};
}
}
+
+ my $i = scalar(keys %{ $netsplitservers{$s1} });
+ delete $netsplitservers{$s1} unless ($i);
}
# %netsplit hash checker.
delete $netsplit{$_};
}
+ &DEBUG("nsC: netsplitservers: ".scalar(keys %netsplitservers) );
+ &DEBUG("nsC: netsplit: ".scalar(keys %netsplit) );
+
if ($count and !scalar keys %netsplit) {
- &DEBUG("ok, netsplit is hopefully gone. reinstating chanlimit check.");
+ &DEBUG("nsC: netsplit is hopefully gone. reinstating chanlimit check.");
&chanlimitCheck();
}
}
if (@_) {
&ScheduleThis(60, "floodLoop"); # minutes.
return if ($_[0] eq "2");
- } else {
- delete $sched{"floodLoop"}{RUNNING};
}
my $time = time();
my $interval = &getChanConfDefault("floodCycle",60);
foreach $who (keys %flood) {
- foreach (keys %{$flood{$who}}) {
+ foreach (keys %{ $flood{$who} }) {
if (!exists $flood{$who}{$_}) {
&WARN("flood{$who}{$_} undefined?");
next;
my $interval = &getChanConfDefault("seenFlushInterval", 60);
&ScheduleThis($interval, "seenFlush");
return if ($_[0] eq "2");
- } else {
- delete $sched{"seenFlush"}{RUNNING};
}
my %stats;
if ($param{'DBType'} =~ /^mysql|pg|postgres/i) {
foreach $nick (keys %seencache) {
- if (0) {
- #BROKEN#
my $retval = &dbReplace("seen", "nick", $nick, (
- "nick" => $seencache{$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...
+
+ ###
+ ### old code.
+ ###
my $exists = &dbGet("seen","nick", $nick, "nick");
&status("Flushed $flushed seen entries.") if ($flushed);
&VERB(sprintf(" new seen: %03.01f%% (%d/%d)",
$stats{'new'}*100/($stats{'count_old'} || 1),
- $stats{'new'}, $stats{'count_old'} ), 2) if ($stats{'new'});
+ $stats{'new'}, ( $stats{'count_old'} || 1) ), 2) if ($stats{'new'});
&VERB(sprintf(" now seen: %3.1f%% (%d/%d)",
- $stats{'old'}*100/&countKeys("seen"),
+ $stats{'old'}*100 / ( &countKeys("seen") || 1),
$stats{'old'}, &countKeys("seen") ), 2) if ($stats{'old'});
&WARN("scalar keys seenflush != 0!") if (scalar keys %seenflush);
if (@_) {
&ScheduleThis(240, "leakCheck");
return if ($_[0] eq "2");
- } else {
- delete $sched{"leakCheck"}{RUNNING};
}
- # flood.
+ # flood. this is dealt with in floodLoop()
foreach $blah1 (keys %flood) {
foreach $blah2 (keys %{ $flood{$blah1} }) {
$count += scalar(keys %{ $flood{$blah1}{$blah2} });
$count += scalar(keys %{ $floodjoin{$blah1}{$blah2} });
}
}
- &DEBUG("leak: hash flood has $count total keys.",2);
+ &DEBUG("leak: hash floodjoin has $count total keys.",2);
# floodwarn.
$count = scalar(keys %floodwarn);
}
}
+ # chanstats
+ $count = scalar(keys %chanstats);
+ &DEBUG("leak: hash chanstats has $count total keys.",2);
+
+ # nuh.
my $delete = 0;
foreach (keys %nuh) {
next if (&IsNickInAnyChan($_));
if (@_) {
&ScheduleThis(60, "ignoreCheck");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"ignoreCheck"}{RUNNING};
}
my $time = time();
}
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);
+ 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();
}
- # chanserv ops.
- foreach ( &ChanConfList("chanServ_ops") ) {
- next if (exists $channels{$chan}{'o'}{$ident});
-
- &status("ChanServ ==> Requesting ops for $chan.");
- &rawout("PRIVMSG ChanServ :OP $chan $ident");
- }
-
- if (!$conn->connected or time - $msgtime > 3600) {
+ 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!");
if ($ident !~ /^\Q$param{ircNick}\E$/) {
# this does not work unfortunately.
&WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick}).");
+
+ # this check is misleading... perhaps we should do a notify.
if (! &IsNickInAnyChan( $param{ircNick} ) ) {
&DEBUG("$param{ircNick} not in use... changing!");
&nick( $param{ircNick} );
}
}
- &joinNextChan();
- # if scalar @joinnext => join more channels
- # else check for chanserv.
-
if (grep /^\s*$/, keys %channels) {
- &WARN("we have a NULL chan in hash channels? removing!");
- delete $channels{''};
-
- &DEBUG("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!");
}
- &DEBUG("channels END");
+ 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();
if (@_) {
&ScheduleThis(240, "miscCheck");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"miscCheck"}{RUNNING};
}
# SHM check.
}
# make backup of important files.
- &mkBackup( $bot_misc_dir."/blootbot.chan", 60*60*24*7);
- &mkBackup( $bot_misc_dir."/blootbot.users", 60*60*24*7);
- &mkBackup( $bot_base_dir."/blootbot-news.txt", 60*60*24*7);
+ &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} }) {
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) ) {
if (@_) {
&ScheduleThis(5, "shmFlush");
return if ($_[0] eq "2");
- } else {
- delete $sched{"shmFlush"}{RUNNING};
}
my $time;
if (@_) {
&ScheduleThis(30, "getNickInUse");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"getNickInUse"}{RUNNING};
}
- &status("Trying to get my nick back.");
&nick( $param{'ircNick'} );
}
if (@_) {
&ScheduleThis(60, "uptimeLoop");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"uptimeLoop"}{RUNNING};
}
&uptimeWriteFile();
if (@_) {
&ScheduleThis(60, "slashdotLoop");
return if ($_[0] eq "2");
- } else {
- delete $sched{"slashdotLoop"}{RUNNING};
}
my @chans = &ChanConfList("slashdotAnnounce");
if (@_) {
&ScheduleThis(60, "freshmeatLoop");
return if ($_[0] eq "2");
- } else {
- delete $sched{"freshmeatLoop"}{RUNNING};
}
my @chans = &ChanConfList("freshmeatAnnounce");
if (@_) {
&ScheduleThis(240, "kernelLoop");
return if ($_[0] eq "2");
- } else {
- delete $sched{"kernelLoop"}{RUNNING};
}
my @chans = &ChanConfList("kernelAnnounce");
if (@_) {
&ScheduleThis(60, "wingateWriteFile");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"wingateWriteFile"}{RUNNING};
}
return unless (scalar @wingateCache);
print OUT "$_\n";
}
close OUT;
-
}
sub factoidCheck {
if (@_) {
- &ScheduleThis(1440, "factoidCheck");
+ &ScheduleThis(720, "factoidCheck");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"factoidCheck"}{RUNNING};
}
my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#");
foreach (@list) {
my $age = &getFactInfo($_, "modified_time");
+ &DEBUG("fC: _ => '$_'; age => $age");
+
if (!defined $age or $age !~ /^\d+$/) {
- &WARN("age == NULL or not numeric.");
+ if (scalar @list > 50) {
+ if (!$cache{warnDel}) {
+ &WARN("list is over 50 (".scalar(@list)."... giving it a miss.");
+ $cache{warnDel} = 1;
+ last;
+ }
+ }
+
+ &WARN("del factoid: old cruft (no time): $_");
+ &delFactoid($_);
next;
}
+ &DEBUG("del factoid: delta => ".($time - $age) );
next unless ($time - $age > $stale);
my $fix = $_;
$fix =~ s/ #DEL#$//g;
- &DEBUG("safedel: Removing $fix ($_) for good.");
+ my $agestr = &Time2String($time - $age);
+ &DEBUG("safedel: Removing '$_' for good. [$agestr old]");
&delFactoid($_);
}
if (@_) {
&ScheduleThis(10, "dccStatus");
return if ($_[0] eq "2"); # defer.
- } else {
- delete $sched{"dccStatus"}{RUNNING};
}
my $time = strftime("%H:%M", localtime(time()) );
}
sub mkBackup {
- my($file, $time) = @_;
- my $backup = 0;
+ my($file, $time) = @_;
+ my $backup = 0;
if (! -f $file) {
- &WARN("mkB: file $file don't exist.");
+ &WARN("mkB: file '$file' does not exist.");
return;
}
}
return unless ($backup);
+ # should delta be time(file) - time(file~)?
+ my $delta = time() - (stat "$file~")[9];
+ my $age = &Time2String($delta);
+
### TODO: do internal copying.
- &status("Backup: $file to $file~");
+ &status("Backup: $file ($age)");
CORE::system("/bin/cp $file $file~");
}
projects / infobot.git / blobdiff