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 54f0657da732d6e1ab88ff44da485b054c7a94fc..872357b5ba46268639956c772fdda4bd9739d484 100755 (executable)
--- 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 11effd994f8fbb37fda88355e6bc1635644872f2..252d3f97ede911feeab99a847cec007581b3a81c 100755 (executable)
--- 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/;
        }
 }