X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Flogger.pl;h=6e80e6c181576ded12197b77327789decaa0c50a;hb=00a9e4d308cb289ef672ad08ce7a55044e9a68c4;hp=3e159ae3390cfe8646a38743da7247dea6956e83;hpb=077833722ef75050ab46a7ccd8d254e5d90d699a;p=infobot.git diff --git a/src/logger.pl b/src/logger.pl index 3e159ae..6e80e6c 100644 --- a/src/logger.pl +++ b/src/logger.pl @@ -9,11 +9,9 @@ use strict; use vars qw($statcount $bot_pid $forkedtime $statcountfix $addressed); -use vars qw($logDate $logold $logcount $logtime $logrepeat); +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; @@ -45,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'); @@ -93,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: $!"); } } @@ -189,24 +187,27 @@ sub status { my($input) = @_; my $status; + if ($input =~ /PERL: Use of uninitialized/) { + &debug_perl($input); + return; + } + if ($input eq $logold) { - # allow perl flooding - $logrepeat++ unless ($input =~ /PERL: Use of uninitialized/); + $logrepeat++; + return; + } - # todo: prevent massive repetitive throttling. - if ($logrepeat >= 3) { - $logrepeat = 0; - &status("LOG: repeat throttle."); - sleep 1; - } - } else { - $logold = $input; + $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. my $ref = ref $input; if (defined $ref and $ref ne "") { - &status("status: 'input' is not scalar ($ref)."); + &WARN("status: 'input' is not scalar ($ref)."); if ($ref eq "ARRAY") { foreach (@$input) { @@ -217,13 +218,19 @@ sub status { # Something is using this w/ NULL. if (!defined $input or $input =~ /^\s*$/) { - $input = "Blank status call? HELP HELP HELP"; + $input = "ERROR: Blank status call? HELP HELP HELP"; } for ($input) { s/\n+$//; - s/\n//g; - s/\002|037//g; # bold,video,underline => remove. + s/\002|\037//g; # bold,video,underline => remove. + } + + # does this work? + if ($input =~ /\n/) { + foreach (split /\n/, $input) { + &status($_); + } } # pump up the stats. @@ -240,12 +247,13 @@ sub status { 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. @@ -276,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+>) //) { @@ -301,32 +310,39 @@ 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. + # 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. } @@ -334,25 +350,65 @@ sub status { 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; } - 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; } @@ -367,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;