- added debugging to newsFlush()

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@472 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index fc96d2830552281bd702fb6fee1c34f49068e271..c050904db15002baba5ea85329289fdac5358ff7 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -262,7 +262,7 @@ sub chanLimitVerify {
     my $l      = $channels{$chan}{'l'};
 
     if (scalar keys %netsplitservers) {
-       &WARN("clV: netsplit active (1); skipping. (netsplit => $netsplit)");
+       &WARN("clV: netsplit active (1); skipping.");
        return;
     }
 

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index d82c9eb63efdca5bbc7d3c6eae4235f1a4d8e9a7..5ec5802dff07fe2f3f8d1f05f611b2c621c4d445 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -298,12 +298,17 @@ sub newsFlush {
     my $delete = 0;
     my $oldest = time();
     foreach $chan (keys %::news) {
+       &DEBUG("sched: chan => $chan");
+
        foreach $item (keys %{ $::news{$chan} }) {
            my $t = $::news{$chan}{$item}{Expire};
+           &DEBUG("sched; item => $item");
 
            my $tadd    = $::news{$chan}{$item}{Time};
            $oldest     = $tadd if ($oldest > $tadd);
 
+           &DEBUG("sched: t => $t");
+
            next if ($t == 0 or $t == -1);
            if ($t < 1000) {
                &status("newsFlush: Fixed Expire time for $chan/$item, should not happen anyway.");
@@ -311,7 +316,11 @@ sub newsFlush {
                next;
            }
 
+           my $delta = $t - time();
+           &DEBUG("news: delta: $delta");
+
            next unless (time() > $t);
+
            # todo: show how old it was.
            delete $::news{$chan}{$item};
            &VERB("NEWS: deleted '$item'", 2);
@@ -319,6 +328,11 @@ sub newsFlush {
        }
     }
 
+    if ($delete) {
+       &DEBUG("sched: Writing news....");
+       &News::writeNews();
+    }
+
     # todo: flush users aswell.
     my $duser  = 0;
     foreach $chan (keys %::newsuser) {
@@ -556,9 +570,9 @@ sub seenFlush {
     &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);