From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 7 Jan 2013 19:04:30 +0000 (-0700)
Subject: Fixed job entering/leaving search patterns in job tracing scripts.
X-Git-Tag: SQUID_3_5_0_1~444^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe75c7dede69f660c85147ab6197875dccf584c;p=thirdparty%2Fsquid.git

Fixed job entering/leaving search patterns in job tracing scripts.

Same as trunk r12530.
---

diff --git a/scripts/trace-master.pl b/scripts/trace-master.pl
index 11effd994f..252d3f97ed 100755
--- a/scripts/trace-master.pl
+++ b/scripts/trace-master.pl
@@ -27,8 +27,8 @@ my $inside = 0;
 my $entering;
 
 while (<STDIN>) {
-	$entering = $_ if !$inside && /\| entering\b/;
-	undef $entering if /\| leaving\b/;
+	$entering = $_ if !$inside && /[|:] entering\b/;
+	undef $entering if /[|:] leaving\b/;
 
 	if (!$inside && /\bstatus in\b.*\b(?:async|job|icapx)(\d+)\b/o) {
 		$inside = $1;
@@ -48,7 +48,7 @@ while (<STDIN>) {
 		&linkJobs($inside, $1, $_);
 	}
 	
-	if (/\| leaving\b/) {
+	if (/[|:] leaving\b/) {
 		$inside = 0;
 	}
 }
@@ -158,6 +158,6 @@ sub reportJobHistory {
 
 	foreach my $line (@lines) {
 		print "$line\n";
-		print "\n" if $line =~ /\| leaving\b/;
+		print "\n" if $line =~ /[|:] leaving\b/;
 	}
 }