Changeset 28980 for branches/eam_branches/ipp-20100621/tools/czartool.pl

Timestamp:

Aug 19, 2010, 6:50:13 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/tools/czartool.pl (modified) (3 diffs)

branches/eam_branches/ipp-20100621/tools/czartool.pl

@@ -64 +64 @@
 
         if ($key eq "s") {checkServers();}
-        elsif ($key eq "l") {checkAllLabels("new");}
-        elsif ($key eq "u") {serverStatus("stdscience");}
+        elsif ($key eq "l") {checkAllLabels("stdscience");}
+        elsif ($key eq "u") {$pantasks->getServerCurrentStatus("stdscience");}
         elsif ($key =~ m/[0-9]/) {my $key2=getc; checkOneLabel($stdscienceLabels[($key.$key2)-1]);}
         printInstructions();
@@ -99 +99 @@
 
     return \@diff;
-}
-
-###########################################################################
-#
-# Prints the status of a given pantasks server
-#
-###########################################################################
-sub serverStatus {
-    my ($server) = @_;
-
-    my @cmdOut = `echo "status;quit" | pantasks_client -c ~ipp/$server/ptolemy.rc 2>&1`;
-    my $line;
-    foreach $line (@cmdOut) {
-
-        chomp($line);
-
-        print "$line\n";
-    }
 }
 
@@ -263 +245 @@
     my $new = $gpc1Db->countExposures($label, $stage, $state);
 
-    if ($state ne "new") {return $new;}
-
-    my $faults = $gpc1Db->countFaults($label, $stage);
+    #if ($state ne "new") {return $new;}
+
+    my $faults = $gpc1Db->countFaults($label, $stage, $state);
 
     if ($faults < 1) {return $new;}