Changeset 28834

Timestamp:

Aug 3, 2010, 9:30:38 AM (16 years ago)

Author:

rhenders

Message:

Added method to check for dodgy responses from pantasks_client

File:

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

trunk/tools/czartool/Pantasks.pm

@@ -20 +20 @@
         "summitcopy"
         );
-
 
 ###########################################################################
@@ -61 +60 @@
 ###########################################################################
 #
+# Checks for a meaningful response from pantasks client 
+#
+###########################################################################
+sub outputOk {
+    my ($self, $output) = @_;
+
+    if (
+            $output =~ m/.*show\.labels.*/i ||
+            $output =~ m/.*Connection reset by peer.*/i ||
+            $output =~ m/.*server is busy.*/i ) { 
+
+        print "* WARNING: pantasks returned '$output'\n";
+        return 0;
+    }
+    return 1;
+}
+
+###########################################################################
+#
 # Gets labels for provided server 
 #
@@ -77 +95 @@
         if ($line =~ m/pantasks:\s+(.*)/) {
 
-            # HACK quit if we get 'show.labels: Command not found.'
-            if ($1 =~ m/.*show\.labels.*/i) {return \@labels;};
-            # HACK quit if we get 'Connection reset by peer'
-            if ($1 =~ m/.*Connection reset by peer.*/i) {return \@labels;};
-            # HACK quit if we get 'server is busy' message
-            if ($1 =~ m/.*server is busy.*/i) {return \@labels;};
+            if (!$self->outputOk($1)) {return \@labels;}
+
             # HACK to get around 'dummy' label in stdscience
             if ($1 !~ m/.*dummy.*/) {push(@labels, $1);};