Changeset 40085 for trunk/ippMonitor

Timestamp:

Jul 11, 2017, 12:22:15 PM (9 years ago)

Author:

eugene

Message:

do not break out of the label check loop on the show.labels line

File:

• trunk/ippMonitor/czartool/czartool/Pantasks.pm (modified) (3 diffs)

trunk/ippMonitor/czartool/czartool/Pantasks.pm

@@ -71 +71 @@
 
     if (
-            $output =~ m/.*show\.labels.*/i ||
             $output =~ m/.*Connection reset by peer.*/i ||
             $output =~ m/.*server is busy.*/i ) { 
@@ -120 +119 @@
     my @labels;
 
-    print "stdscience : $ipphome/stdscience/ptolemy.rc\n";
+    # print "stdscience : $ipphome/$server/ptolemy.rc\n";
     my @cmdOut = `echo "show.labels;quit" | pantasks_client -c $ipphome/$server/ptolemy.rc 2>&1`;
     my $line;
     my $passedHeader=0;
     foreach $line (@cmdOut) {
-        print "labels: $line";
+        # print "labels: $line";
         chomp($line);
         if (!$self->outputOk($line)) {return \@labels;}
@@ -135 +134 @@
         }
 
+        # one line has the show.labels command; skip it
+        if ($line =~ m/.*show\.labels.*/i) { next; }
+
         if ($passedHeader && length($line) > 0){push(@labels, $line);}
     }