&leakCheck(2); # mandatory
&ignoreCheck(1); # mandatory
&seenFlushOld(2);
- &ircCheck(2); # mandatory
+# &ircCheck(2); # mandatory
+ &ircCheck(1); # mandatory
&miscCheck(1); # mandatory
&miscCheck2(2); # mandatory
&shmFlush(1); # mandatory
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";
+ if ($param{'DBType'} =~ /^pgsql|mysql/i) {
+ my $query;
+
+ if ($param{'DBType'} =~ /^mysql$/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";
+ }
+
my $sth = $dbh->prepare($query);
$sth->execute;
my $time = time();
foreach (keys %seen) {
- my $delta_time = $time - &dbGet("seen", "NULL", $_, "time");
+ my $delta_time = $time - &dbGet("seen", "time", "nick", $_);
next unless ($delta_time > $max_time);
&DEBUG("seenFlushOld: ".&Time2String($delta_time) );
return if ($_[0] eq "2"); # defer.
}
- if (&ChanConfList("news")) {
- } else {
+ if (!&ChanConfList("news")) {
&DEBUG("newsFlush: news disabled? (chan => $chan)");
return;
}
my $i = 0;
my $total = scalar(keys %{ $::news{$chan} });
- &DEBUG("newsFlush: chan => $chan (total => $total)");
+ if (!$total) {
+ delete $::news{$chan};
+ next;
+ }
foreach $item (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$item}{Expire};
$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);
}
}
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.");
}
}
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.");
+ &status("chanlimit: netsplit; removing it for $chan.");
&rawout("MODE $chan -l");
$cache{chanlimitChange}{$chan} = time();
+ &status("chanlimit: netsplit; removed.");
}
next;
### run NAMES again and flush it.
}
- next unless (!defined $limit);
if (defined $limit and $limit == $newlimit) {
$cache{chanlimitChange}{$chan} = time();
next;
delete $cache{warn}{chanlimit}{$chan};
if (!defined $limit) {
- &status("ChanLimit: setting for first time or from netsplit, for $chan");
+ &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)");
+ &DEBUG("chanLimit: not going to change chanlimit! ($delta<$interval*60)");
return;
}
}
my ($s1,$s2);
if (@_) {
- &ScheduleThis(30, "netsplitCheck");
+ &ScheduleThis(15, "netsplitCheck");
return if ($_[0] eq "2");
}
- &DEBUG("running netsplitCheck...");
+ $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) {
- &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) {
+ if ($delta > 60*30) {
&status("netsplit between $s1 and $s2 appears to be stale.");
delete $netsplitservers{$s1}{$s2};
+ &chanlimitCheck();
}
}
# %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);
+ &DEBUG("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.");
$stats{'new'} = 0;
$stats{'old'} = 0;
- if ($param{'DBType'} =~ /^mysql|pg|postgres/i) {
+ if ($param{'DBType'} =~ /^(mysql|pgsql)$/i) {
foreach $nick (keys %seencache) {
- my $retval = &dbReplace("seen", "nick", $nick, (
-### "nick" => $seencache{$nick}{'nick'},
+ my $retval = &dbReplace("seen", "nick", (
+ "nick" => $seencache{$nick}{'nick'},
"time" => $seencache{$nick}{'time'},
"host" => $seencache{$nick}{'host'},
"channel" => $seencache{$nick}{'chan'},
### old code.
###
- my $exists = &dbGet("seen","nick", $nick, "nick");
+ my $exists = &dbGet("seen", "nick", "nick=".&dbQuote($nick) );
if (defined $exists and $exists) {
&dbUpdate("seen", "nick", $nick, (
&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'});
sub ircCheck {
if (@_) {
- &ScheduleThis(60, "ircCheck");
+ &ScheduleThis(15, "ircCheck");
return if ($_[0] eq "2"); # defer.
}
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();
}
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");
- &DEBUG("fC: _ => '$_'; age => $age");
if (!defined $age or $age !~ /^\d+$/) {
if (scalar @list > 50) {
next;
}
- &DEBUG("del factoid: delta => ".($time - $age) );
- &DEBUG("del factoid: stale => $stale");
next unless ($time - $age > $stale);
my $fix = $_;
$fix =~ s/ #DEL#$//g;
my $agestr = &Time2String($time - $age);
- &DEBUG("safedel: Removing '$_' for good. [$agestr old]");
+ &status("safedel: Removing '$_' for good. [$agestr old]");
&delFactoid($_);
}
-
}
sub dccStatus {
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)");
projects / infobot.git / blobdiff