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

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

Same as trunk r12530.
---

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;
 	}