From fdd0f4e4e998c038b62f456a4f317d60756208f5 Mon Sep 17 00:00:00 2001 From: dms Date: Tue, 1 May 2001 12:37:38 +0000 Subject: [PATCH] - added debugging to newsFlush() git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@472 c11ca15a-4712-0410-83d8-924469b57eb5 --- src/IRC/IrcHelpers.pl | 2 +- src/IRC/Schedulers.pl | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl index fc96d28..c050904 100644 --- 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 d82c9eb..5ec5802 100644 --- 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); -- 2.39.2