Changeset 42069

Timestamp:

Feb 24, 2022, 5:05:58 PM (4 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20211108/pstamp/scripts

Files:

• dqueryparse.pl (modified) (1 diff)
• pstamp_server_status (modified) (2 diffs)

branches/eam_branches/ipp-20211108/pstamp/scripts/dqueryparse.pl

@@ -448 +448 @@
             my $stage_id = $query{$fpa_id}{STAGE_ID}[$i];
             my $component = $query{$fpa_id}{COMPONENT_ID}[$i];
+            my $imagedb = $query{$fpa_id}{IMAGE_DB}[$i];
             print "Need to UPDATE $stage $stage_id $component from $data_state\n";
             $dep_id = queue_update_run($req_id, $outdir, $label, $data_state, $stage, $stage_id, $component, 0, $imagedb);

branches/eam_branches/ipp-20211108/pstamp/scripts/pstamp_server_status

@@ -53 +53 @@
 my $now = `date -u`;
 
-print "<b>Status updated: &nbsp;&nbsp;&nbsp;</b> $now<br /><br />\n";
+print "<b>Status updated: &nbsp;&nbsp;&nbsp;</b> $now<br />\n";
 
 my $down = 0;
@@ -121 +121 @@
 
     if ($scheduler_state) {
-        print "Pantasks Scheduler $scheduler_state.\n";
+        print $br . "Pantasks Scheduler $scheduler_state.\n";
         if ($controller_state) {
             print $br . "Pantasks Controller $controller_state.\n";
+            # loading active labels
+            my $runlabels = `echo \"show.labels; quit\" \| pantasks_client -c ~ippitc/pstamp/ptolemy.rc \| tail -n +7`;
+            print $br . "Current Labels: \n" . $runlabels . "\n";
         } else {
             print STDERR "Controller state not found";