X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=92765ab4132f0ee913e0e32c8b4ae442be8dafc0;hb=78cf2dcb9be8128af7f8dc5ae37540c9c53c6057;hp=745d6983ebff1598ddf626d4ebdfb5e8249e82d1;hpb=f4bc6091a243be2891148902d41e921e171e1a44;p=spider.git

diff --git a/perl/watchdbg b/perl/watchdbg
index 745d6983..92765ab4 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -6,6 +6,7 @@
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
+#   watchdbg 2 PCPROT       # watch all PCPROT messages + up to 2 lines before
 #   watchdbg gb7baa gb7djk   # watch the conversation between BAA and DJK 
 #
 
@@ -31,7 +32,11 @@ 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+$/;
+$nolines = abs $nolines if $nolines < 0;  
 my $exp = join '|', @ARGV;
+my @prev;
 
 # seek to end of file
 $fh->seek(0, 2);
@@ -39,28 +44,45 @@ 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 ($t, $l) =  split /\^/, $line, 2;
+		my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
+		my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec;
+		
+		print $buf, ' ', $l, "\n"; 
+	}
 }
 exit(0);