- bot stats: "blah has blah... is ranked xx/yy (zz percentile)"

[infobot.git] / src / logger.pl

diff --git a/src/logger.pl b/src/logger.pl
index 2f9f945429517a669528198076ec505ede10fef0..5601b91447bf6a7f513e3a380d88d77e30f308e0 100644 (file)
--- a/src/logger.pl
+++ b/src/logger.pl
@@ -1,15 +1,15 @@
 #
 # logger.pl: logger functions!
 #    Author: dms
-#   Version: v0.3 (20000731)
+#   Version: v0.4 (20000923)
 #  FVersion: 19991205
 #      NOTE: Based on code by Kevin Lenzo & Patrick Cole  (c) 1997
 #
 
 use strict;
 
-use vars qw($logDate $statcount $bot_pid $forkedtime
-           $statcountfix $addressed $logcount $logtime);
+use vars qw($statcount $bot_pid $forkedtime $statcountfix $addressed);
+use vars qw($logDate $logold $logcount $logtime $logrepeat);
 use vars qw(@backlog);
 use vars qw(%param %file);
 
@@ -17,6 +17,10 @@ require 5.001;
 
 $logtime       = time();
 $logcount      = 0;
+$logrepeat     = 0;
+$logold                = "";
+
+$param{VEBOSITY} ||= 1;                # lame fix for preload
 
 my %attributes = (
        'clear'      => 0,
@@ -89,7 +93,7 @@ sub openLog {
     }
 
     if (&IsParam("logType") and $param{'logType'} =~ /DAILY/i) {
-       my ($day,$month,$year) = (localtime(time()))[3,4,5];
+       my ($day,$month,$year) = (localtime time())[3,4,5];
        $logDate = sprintf("%04d%02d%02d",$year+1900,$month+1,$day);
        $file{log} .= "-".$logDate;
     }
@@ -107,8 +111,8 @@ sub closeLog {
     return unless (&IsParam("logfile"));
     return unless (defined fileno LOG);
 
-    &status("Closed logfile ($file{log}).");
     close LOG;
+    &status("Closed logfile ($file{log}).");
 }
 
 #####
@@ -119,12 +123,11 @@ sub compress {
     my $okay = 0;
 
     if (! -f $file) {
-       # ironically this does not get logged :)
        &WARN("compress: file ($file) does not exist.");
        return 0;
     }
 
-    if (-f "$file.gz" or -f "$file.bz2") {
+    if ( -f "$file.gz" or -f "$file.bz2" ) {
        &WARN("compress: file.(gz|bz2) already exists.");
        return 0;
     }
@@ -165,7 +168,7 @@ sub WARN {
 }
 
 sub FIXME {
-    &status("${b_cyan}!FIXME!$ob $_[0] (SHOULD NOT HAPPEN?)");
+    &status("${b_cyan}!FIXME!$ob $_[0]");
 }
 
 sub TODO {
@@ -186,10 +189,26 @@ sub status {
     my($input) = @_;
     my $status;
 
+    if ($input eq $logold) {
+       # allow perl flooding
+       $logrepeat++ unless ($input =~ /PERL: Use of uninitialized/);
+
+       # todo: prevent massive repetitive throttling.
+       if ($logrepeat >= 3) {
+           $logrepeat = 0;
+           &status("LOG: repeat throttle.");
+           sleep 1;
+       }
+    } else {
+       $logold = $input;
+    }
+
     # if it's not a scalar, attempt to warn and fix.
-    if (ref($input) ne "") {
-       &status("status: 'input' is not scalar (".ref($input).").");
-       if (ref($input) eq "ARRAY") {
+    my $ref = ref $input;
+    if (defined $ref and $ref ne "") {
+       &status("status: 'input' is not scalar ($ref).");
+
+       if ($ref eq "ARRAY") {
            foreach (@$input) {
                &WARN("status: '$_'.");
            }
@@ -198,12 +217,22 @@ sub status {
 
     # Something is using this w/ NULL.
     if (!defined $input or $input =~ /^\s*$/) {
-       $input = "Blank status call?";
+       $input = "Blank status call? HELP HELP HELP";
     }
-    $input =~ s/\n+$//;
-    $input =~ s/\002|037//g;   # bold,video,underline => remove.
 
-    # pump up the stats (or loglinenum).
+    for ($input) {
+       s/\n+$//;
+       s/\002|037//g;  # bold,video,underline => remove.
+    }
+
+    # does this work?
+    if ($input =~ /\n/) {
+       foreach (split(/\n/, $input)) {
+           &status($_);
+       }
+    }
+
+    # pump up the stats.
     $statcount++;
 
     # fix style of output if process is child.
@@ -214,19 +243,21 @@ sub status {
 
     ### LOG THROTTLING.
     ### TODO: move this _after_ printing?
-    my $time = time();
-    my $reset = 0;
-    if ($logtime != $time) {
-       $reset++;
-    } elsif ($logtime == $time) {
-       if ($logcount < 25) {           # too high?
+    my $time   = time();
+    my $reset  = 0;
+
+    if ($logtime == $time) {
+       if ($logcount < 25) {                   # too high?
            $logcount++;
        } else {
            sleep 1;
            &status("LOG: Throttling.");        # recursive?
            $reset++;
        }
+    } else {   # $logtime != $time.
+       $reset++;
     }
+
     if ($reset) {
        $logtime        = $time;
        $logcount       = 0;
@@ -237,7 +268,7 @@ sub status {
        $status = "!$statcount! ".$input;
        if ($statcount > 1000) {
            print LOG "ERROR: FORKED PROCESS RAN AWAY; KILLING.\n";
-           print LOG "VERB: ".(&Time2String(time() - $forkedtime))."\n";
+           print LOG "VERB: ".(&Time2String($time - $forkedtime))."\n";
            exit 0;
        }
     } else {
@@ -251,9 +282,9 @@ sub status {
 
     if (&IsParam("VERBOSITY")) {
        if ($statcountfix) {
-           printf $_red."!%5d!".$ob." ", $statcount;
+           printf $_red."!%6d!".$ob." ", $statcount;
        } else {
-           printf $_green."[%5d]".$ob." ", $statcount;
+           printf $_green."[%6d]".$ob." ", $statcount;
        }
 
        # three uberstabs to Derek Moeller.
@@ -301,15 +332,17 @@ sub status {
     return unless (defined fileno LOG);
 
     # remove control characters from logging.
-    $input =~ s/\e\[[0-9;]+m//g;
-    $input =~ s/[\cA-\c_]//g;
+    for ($input) {
+       s/\e\[[0-9;]+m//g;      # escape codes.
+       s/[\cA-\c_]//g;         # control chars.
+    }
     $input = "FORK($$) ".$input if ($statcountfix);
 
     my $date;
     if (&IsParam("logType") and $param{'logType'} =~ /DAILY/i) {
-       $date = sprintf("%02d:%02d.%02d", (localtime(time()))[2,1,0]);
+       $date = sprintf("%02d:%02d.%02d", (localtime $time)[2,1,0]);
 
-       my ($day,$month,$year) = (localtime(time()))[3,4,5];
+       my ($day,$month,$year) = (localtime $time)[3,4,5];
        my $newlogDate = sprintf("%04d%02d%02d",$year+1900,$month+1,$day);
        if (defined $logDate and $newlogDate != $logDate) {
            &closeLog();
@@ -317,7 +350,7 @@ sub status {
            &openLog();
        }
     } else {
-       $date = time();
+       $date   = $time;
     }
 
     print LOG sprintf("%s %s\n", $date, $input);