Fixed watchdbg so that simple arguments work again

[spider.git] / perl / watchdbg

diff --git a/perl/watchdbg b/perl/watchdbg
index 745d6983ebff1598ddf626d4ebdfb5e8249e82d1..c1d6b172beb11a09f63e2c288c7596f152f770f4 100755 (executable)
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -31,7 +31,10 @@ use strict;
 my $fp = DXLog::new('debug', 'dat', 'd');
 my @today = Julian::unixtoj(time()); 
 my $fh = $fp->open(@today) or die $!; 
+my $nolines = 1;
+$nolines = shift if $ARGV[0] =~ /^\d+$/;
 my $exp = join '|', @ARGV;
+my @prev;
 
 # seek to end of file
 $fh->seek(0, 2);
@@ -39,28 +42,46 @@ 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()); 
                if ($today[1] != $now[1]) {
                        $fp->close;
-                       $fh = $fp->open(@now) or die $!; 
+                       my $i;
+                       for ($i = 0; $i < 20; $i++) {
+                               last if $fh = $fp->open(@now);
+                               sleep 5;
+                       }
+                       die $! if $i >= 20; 
+                       @today = @now;
                }
        }
 }
 
 sub printit
 {
-       my $line = shift;
-       my @line =  split '\^', $line;
-       my $t = shift @line;
-       print atime($t), ' ', 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);