X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=7975529655809ac79b1e75447fb827f193f9c86f;hb=575db552c5a635ce2eb431de07f568113374735f;hp=fef5cdf7e8e1f54a081f3da530b2fcd08e32f71b;hpb=d7e79ac62a8403bfdfc40ae69212eb03cff8f7ff;p=spider.git diff --git a/perl/watchdbg b/perl/watchdbg index fef5cdf7..79755296 100755 --- a/perl/watchdbg +++ b/perl/watchdbg @@ -31,7 +31,9 @@ use strict; my $fp = DXLog::new('debug', 'dat', 'd'); my @today = Julian::unixtoj(time()); my $fh = $fp->open(@today) or die $!; +my $nolines = shift if $ARGV[0] =~ /^\d+$/ || 1; my $exp = join '|', @ARGV; +my @prev; # seek to end of file $fh->seek(0, 2); @@ -39,13 +41,18 @@ for (;;) { my $line = <$fh>; if ($line) { if ($exp) { - printit($line) if $line =~ m{(?:$exp)}oi; + push @prev, $line; + shift @prev while @prev > $nolines; + if ($line =~ m{(?:$exp)}oi) { + printit(@prev); + @prev = (); + } } else { - printit($line); - } + printit($line); + } } else { sleep(1); - + # check that the debug hasn't rolled over to next day # open it if it has my @now = Julian::unixtoj(time()); @@ -64,12 +71,16 @@ for (;;) { sub printit { - my $line = shift; - my @line = split '\^', $line; - my $t = shift @line; - my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time); - my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec; - - print $buf, ' ', join('^', @line); + while (@_) { + my $line = shift; + chomp $line; + $line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; + my @line = split '\^', $line; + my $t = shift @line; + my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time); + my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec; + + print $buf, ' ', join('^', @line), "\n"; + } } exit(0);