From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 20 Dec 2012 04:33:39 +0000 (-0700)
Subject: Fixed job entering/leaving search patterns in job tracing scripts
X-Git-Tag: SQUID_3_4_0_1~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ce9bb90ab8801daba66bbb4d8e6ecfea485096e;p=thirdparty%2Fsquid.git

Fixed job entering/leaving search patterns in job tracing scripts
broken by r12436 "Modify debugs() to automatically include HERE"
---

diff --git a/scripts/trace-job.pl b/scripts/trace-job.pl
index 54f0657da7..872357b5ba 100755
--- a/scripts/trace-job.pl
+++ b/scripts/trace-job.pl
@@ -21,8 +21,8 @@ my $inside = 0;
 my $entering;
 
 while (<>) {
-	$entering = $_ if !$inside && /\| entering\b/;
-	undef $entering if /\| leaving\b/;
+	$entering = $_ if !$inside && /[|:] entering\b/;
+	undef $entering if /[|:] leaving\b/;
 
 	# if (!$inside && /\bcalled\b.*\b$XactId\b/o) {
 	if (!$inside && /\bstatus in\b.*\b$XactId\b/o) {
@@ -39,7 +39,7 @@ while (<>) {
 
 	# if (/\bended\b.*\b$XactId\b/o || /\bswan\s+sang\b.*\b$XactId\b/o) {
 	# if (/\bstatus out\b.*\b$XactId\b/o || /\bswan\s+sang\b.*\b$XactId\b/o ||
-	if (/\| leaving\b/) {
+	if (/[|:] leaving\b/) {
 		print "\n";
 		$inside = 0;
 	}
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/;
 	}
 }