sub queueTask {
my($codename, $chanconfdef, $intervaldef, $defer) = @_;
- my $t = &getChanConfDefault($chanconfdef, $intervaldef);
+ my $t = &getChanConfDefault($chanconfdef, $intervaldef, $chan);
my $waittime = &getRandomInt($t);
if (!defined $waittime) {
my $time = $schedule{$codename}[3];
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);
+ #&VERB("Scheduling \&$codename() for " . &Time2String($waittime),3);
my $retval = $conn->schedule($waittime, sub {
\&$codename;
# ONCE OFF.
# REPETITIVE.
- # 1 for run straight away, 2 for on next-run.
- &uptimeLoop(1);
+ # 2 for on next-run.
&randomQuote(2);
&randomFactoid(2);
- &logLoop(1);
- &chanlimitCheck(1);
- &netsplitCheck(1); # mandatory
- &floodLoop(1); # mandatory
&seenFlush(2);
&leakCheck(2); # mandatory
- &ignoreCheck(1); # mandatory
&seenFlushOld(2);
- &ircCheck(1); # mandatory
- &miscCheck(1); # mandatory
&miscCheck2(2); # mandatory
- &shmFlush(1); # mandatory
&slashdotLoop(2);
&plugLoop(2);
&kernelLoop(2);
&wingateWriteFile(2);
&factoidCheck(2); # takes a couple of seconds on a 486. defer it
# TODO: convert to new format... or nuke altogether.
- &newsFlush(1);
+ &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;
}
&status("Schedulers: $count will be running.");
-### &scheduleList();
+ &scheduleList();
}
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;
####
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);
}
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 !~ /^</);
-
- $error++;
- if ($error == 5) {
- &ERROR("rF: tried 5 times but failed.");
- return;
- }
- }
-
foreach ( &ChanConfList("randomFactoid") ) {
next unless (&validChan($_));
&status("sending random Factoid to $_.");
+ while (1) {
+ ($key,$val) = &randKey("factoids","factoid_key,factoid_value");
+ &DEBUG("rF: $key, $val");
+### $val =~ tr/^[A-Z]/[a-z]/; # blah is Good => blah is good.
+ last if ((defined $val) and ($val !~ /^</) and ($key !~ /\#DEL\#/) and ($key !~ /^cmd:/));
+
+ $error++;
+ if ($error == 5) {
+ &ERROR("rF: tried 5 times but failed.");
+ return;
+ }
+ }
&action($_, "Thinks: \037$key\037 is $val");
### FIXME: Use &getReply() on above to format factoid properly?
$good++;
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|sqlite)/i) {
+ if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite(2)?)$/i) {
my $query;
- if ($param{'DBType'} =~ /^mysql|sqlite$/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.
return if ($_[0] eq "2"); # defer.
}
- if (!&ChanConfList("news")) {
+ if (!&ChanConfList('News')) {
&DEBUG("newsFlush: news disabled? (chan => $chan)");
return;
}
}
sub chanlimitCheck {
- my $interval = &getChanConfDefault("chanlimitcheckInterval", 10);
+ my $interval = &getChanConfDefault("chanlimitcheckInterval", 10, $chan);
+ my $mynick=$conn->nick();
if (@_) {
&ScheduleThis($interval, "chanlimitCheck");
next;
}
- if (!exists $channels{$chan}{'o'}{$ident}) {
+ 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);
}
my $time = time();
- my $interval = &getChanConfDefault("floodCycle",60);
+ my $interval = &getChanConfDefault("floodCycle",60, $chan);
foreach $who (keys %flood) {
foreach (keys %{ $flood{$who} }) {
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|sqlite)$/i) {
+ if ($param{'DBType'} =~ /^(mysql|pgsql|sqlite(2)?)$/i) {
foreach $nick (keys %seencache) {
my $retval = &sqlReplace("seen", {
nick => lc $seencache{$nick}{'nick'},
$cache{statusSafe} = 1;
foreach (sort keys %conns) {
$conn=$conns{$_};
+ my $mynick=$conn->nick();
&DEBUG("ircCheck for $_");
my @join = &getJoinChans(1);
if (scalar @join) {
} else {
&status('ircCheck: possible lost in space; checking.'.
scalar(gmtime) );
- &msg($ident, "TEST");
+ &msg($mynick, "TEST");
$cache{connect} = time();
}
}
sub uptimeLoop {
return if (!defined &uptimeWriteFile);
-# return unless &IsChanConf("uptime");
+# return unless &IsParam('Uptime');
if (@_) {
- &ScheduleThis(60, "uptimeLoop");
- return if ($_[0] eq "2"); # defer.
+ &ScheduleThis(60, 'uptimeLoop');
+ return if ($_[0] eq '2'); # defer.
}
&uptimeWriteFile();
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);
sub plugLoop {
if (@_) {
- &ScheduleThis(60, "plugLoop");
+ &ScheduleThis(60, 'plugLoop');
return if ($_[0] eq "2");
}
- my @chans = &ChanConfList("plugAnnounce");
+ my @chans = &ChanConfList('plugAnnounce');
return unless (scalar @chans);
- &Forker("plug", sub {
+ &Forker('Plug', sub {
my $line = &Plug::plugAnnounce();
return unless (defined $line);
my @chans = &ChanConfList("kernelAnnounce");
return unless (scalar @chans);
- &Forker("kernel", sub {
+ &Forker("Kernel", sub {
my @data = &Kernel::kernelAnnounce();
foreach (@chans) {
}
sub wingateCheck {
- return unless &IsChanConf("wingate");
+ return unless &IsChanConf('Wingate') > 0;
### 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') > 0;
- my $reason = &getChanConf("wingateKick");
+ my $reason = &getChanConf('wingateKick');
next unless ($reason);
&kick($who, "", $reason)
&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: ??
sub wingateWriteFile {
if (@_) {
- &ScheduleThis(60, "wingateWriteFile");
+ &ScheduleThis(60, 'wingateWriteFile');
return if ($_[0] eq "2"); # defer.
}
my $file = "$bot_base_dir/$param{'ircUser'}.wingate";
if ($bot_pid != $$) {
- &DEBUG("wingateWriteFile: Reorganising!");
+ &DEBUG('wingateWriteFile: Reorganising!');
open(IN, $file);
while (<IN>) {
@wingateNow = sort keys %hash;
}
- &DEBUG("wingateWF: writing...");
+ &DEBUG('wingateWF: writing...');
open(OUT, ">$file");
foreach (@wingateNow) {
print OUT "$_\n";
}
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;
# 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.");
+ &DEBUG("$reply");
}
sub mkBackup {