X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Flogger.pl;h=6e80e6c181576ded12197b77327789decaa0c50a;hb=429a001e1483c0495a09badfea04a19b8e14a0b3;hp=2f9f945429517a669528198076ec505ede10fef0;hpb=52768ee62d7fa3a0d44fdd6068fa47cc03e5fbef;p=infobot.git diff --git a/src/logger.pl b/src/logger.pl index 2f9f945..6e80e6c 100644 --- a/src/logger.pl +++ b/src/logger.pl @@ -1,22 +1,24 @@ # # 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 $running); use vars qw(@backlog); -use vars qw(%param %file); - -require 5.001; +use vars qw(%param %file %cache); $logtime = time(); $logcount = 0; +$logrepeat = 0; +$logold = ""; + +$param{VEBOSITY} ||= 1; # lame fix for preload my %attributes = ( 'clear' => 0, @@ -41,7 +43,7 @@ use vars qw($b_black $_black $b_red $_red $b_green $_green $b_yellow $_yellow $b_blue $_blue $b_magenta $_magenta $b_cyan $_cyan $b_white $_white $_reset $_bold $ob $b); -$b_black = cl('bold black'); $_black = cl('black'); +$b_black = cl('bold black'); $_black = cl('black'); $b_red = cl('bold red'); $_red = cl('red'); $b_green = cl('bold green'); $_green = cl('green'); $b_yellow = cl('bold yellow'); $_yellow = cl('yellow'); @@ -89,16 +91,16 @@ sub openLog { } if (&IsParam("logType") and $param{'logType'} =~ /DAILY/i) { - my ($day,$month,$year) = (localtime(time()))[3,4,5]; + my ($day,$month,$year) = (gmtime time())[3,4,5]; $logDate = sprintf("%04d%02d%02d",$year+1900,$month+1,$day); - $file{log} .= "-".$logDate; + $file{log} .= $logDate; } if (open(LOG, ">>$file{log}")) { &status("Opened logfile $file{log}."); LOG->autoflush(1); } else { - &status("cannot open logfile $file{log}; not logging."); + &status("Cannot open logfile ($file{log}); not logging: $!"); } } @@ -107,8 +109,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 +121,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 +166,7 @@ sub WARN { } sub FIXME { - &status("${b_cyan}!FIXME!$ob $_[0] (SHOULD NOT HAPPEN?)"); + &status("${b_cyan}!FIXME!$ob $_[0]"); } sub TODO { @@ -186,10 +187,29 @@ sub status { my($input) = @_; my $status; + if ($input =~ /PERL: Use of uninitialized/) { + &debug_perl($input); + return; + } + + if ($input eq $logold) { + $logrepeat++; + return; + } + + $logold = $input; + # if only I had followed how sysklogd does it, heh. lame me. -xk + if ($logrepeat >= 3) { + &status("LOG: last message repeated $logrepeat times"); + $logrepeat = 0; + } + # 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 "") { + &WARN("status: 'input' is not scalar ($ref)."); + + if ($ref eq "ARRAY") { foreach (@$input) { &WARN("status: '$_'."); } @@ -198,12 +218,22 @@ sub status { # Something is using this w/ NULL. if (!defined $input or $input =~ /^\s*$/) { - $input = "Blank status call?"; + $input = "ERROR: Blank status call? HELP HELP HELP"; + } + + for ($input) { + s/\n+$//; + s/\002|\037//g; # bold,video,underline => remove. + } + + # does this work? + if ($input =~ /\n/) { + foreach (split /\n/, $input) { + &status($_); + } } - $input =~ s/\n+$//; - $input =~ s/\002|037//g; # bold,video,underline => remove. - # pump up the stats (or loglinenum). + # pump up the stats. $statcount++; # fix style of output if process is child. @@ -214,19 +244,22 @@ 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; + + # hrm... what is this supposed to achieve? nothing I guess. + if ($logtime == $time) { + if ($logcount < 25) { # too high? $logcount++; } else { sleep 1; - &status("LOG: Throttling."); # recursive? + &status("LOG: Throttling."); $reset++; } + } else { # $logtime != $time. + $reset++; } + if ($reset) { $logtime = $time; $logcount = 0; @@ -237,7 +270,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,12 +284,13 @@ 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. + # three uberstabs to Derek Moeller. I don't remember why but he + # deserved it :) my $printable = $input; if ($printable =~ s/^(<\/\S+>) //) { @@ -276,56 +310,105 @@ sub status { } elsif ($printable =~ s/^\* (\S+)\/(\S+) //) { # public action. print "$b_white*$ob $b_cyan$1$ob/$b_blue$2$ob $printable\n"; + } elsif ($printable =~ s/^(-\S+-) //) { # notice print "$_green$1 $printable$ob\n"; + } elsif ($printable =~ s/^(\* )?(\[\S+\]) //) { # message/private action from someone print "$b_white$1$ob" if (defined $1); print "$b_red$2 $printable$ob\n"; + } elsif ($printable =~ s/^(>\S+<) //) { # i'm messaging someone print "$b_magenta$1 $printable$ob\n"; + } elsif ($printable =~ s/^(enter:|update:|forget:) //) { # something that should be SEEN print "$b_green$1 $printable$ob\n"; + } else { print "$printable\n"; } + } else { - print "VERBOSITY IS OFF?\n"; + #print "VERBOSITY IS OFF?\n"; } # log the line into a file. return unless (&IsParam("logfile")); return unless (defined fileno LOG); - # remove control characters from logging. - $input =~ s/\e\[[0-9;]+m//g; - $input =~ s/[\cA-\c_]//g; + # remove control characters from logging to LOGFILE. + for ($input) { + last if (&IsParam("logColors")); + 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", (gmtime $time)[2,1,0]); - my ($day,$month,$year) = (localtime(time()))[3,4,5]; + my ($day,$month,$year) = (gmtime $time)[3,4,5]; my $newlogDate = sprintf("%04d%02d%02d",$year+1900,$month+1,$day); if (defined $logDate and $newlogDate != $logDate) { &closeLog(); - &compress($file{log}); + &compress( $file{log} ); &openLog(); } } else { - $date = time(); + $date = $time; } - print LOG sprintf("%s %s\n", $date, $input); + printf LOG "%s %s\n", $date, $input; +} + +sub debug_perl { + my ($str) = @_; + + return unless ($str =~ /^WARN: Use of uninitialized value .* at (\S+) line (\d+)/); + my ($file,$line) = ($1,$2); + if (!open(IN,$file)) { + &status("WARN: cannot open $file: $!"); + return; + } + + # TODO: better filename. + open(OUT, ">>debug.log"); + print OUT "DEBUG: $str\n"; + + # note: cannot call external functions because SIG{} does not allow us to. + my $i; + while () { + chop; + $i++; + # bleh. this tries to duplicate status(). + # TODO: statcountfix + # TODO: rename to log_*someshit* + if ($i == $line) { + my $msg = "$file: $i:!$_"; + printf "%s[%6d]%s %s\n", $_green, $statcount, $ob, $msg; + print OUT "DEBUG: $msg\n"; + $statcount++; + next; + } + if ($i+3 > $line && $i-3 < $line) { + my $msg = "$file: $i: $_"; + printf "%s[%6d]%s %s\n", $_green, $statcount, $ob, $msg; + print OUT "DEBUG: $msg\n"; + $statcount++; + } + } + close IN; + close OUT; } sub openSQLDebug { if (!open(SQLDEBUG, ">>$param{'SQLDebug'}")) { - &ERROR("cannot open $param{'SQLDebug'}..."); + &ERROR("Cannot open ($param{'SQLDebug'}): $!"); delete $param{'SQLDebug'}; return 0; } @@ -340,4 +423,12 @@ sub closeSQLDebug { &status("Closed SQL Debug file: $param{'SQLDebug'}"); } +sub SQLDebug { + return unless (&IsParam("SQLDebug")); + + return unless (fileno SQLDEBUG); + + print SQLDEBUG $_[0]."\n"; +} + 1;