Changeset 28825

Timestamp:

Aug 2, 2010, 11:06:32 AM (16 years ago)

Author:

rhenders

Message:

czartool.pl now using Pantasks method to get server status

Location:

trunk/tools

Files:

• czartool.pl (modified) (2 diffs)
• czartool/Pantasks.pm (modified) (2 diffs)

trunk/tools/czartool.pl

@@ -65 +65 @@
         if ($key eq "s") {checkServers();}
         elsif ($key eq "l") {checkAllLabels("new");}
-        elsif ($key eq "u") {serverStatus("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";
-    }
 }
 

trunk/tools/czartool/Pantasks.pm

@@ -113 +113 @@
         if ($line =~ m/Scheduler is running/) {${$running} = 1; ${$alive}=1;last;}
         if ($line =~ m/Task Status/) {last;}
-
     }
 }
@@ -125 +124 @@
     my ($self, $server) = @_;
 
-
     my @cmdOut = `echo "status;quit" | pantasks_client -c ~ipp/$server/ptolemy.rc 2>&1`;
     my $line;
     my $passedHeader=0;
+    print "\n";
     foreach $line (@cmdOut) {
 
-        chomp($line);
         if ($line =~ m/.*Task Status.*/) {$passedHeader=1;next;}
-        if ($passedHeader){print "$line<br>";}
+        if ($passedHeader){print "$line";}
     }
 }