Changeset 30484

Timestamp:

Feb 3, 2011, 10:41:31 AM (15 years ago)

Author:

bills

Message:

merge in updated scripts for the postage stamp server status page

Location:

tags/ipp-20101215

Files:

• ippTasks/pstamp.pro (modified) (1 diff, 1 prop)
• pstamp (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/Makefile.am (modified) (1 diff)
• pstamp/scripts/psstatus (copied) (copied from trunk/pstamp/scripts/psstatus )
• pstamp/scripts/pstamp_save_server_status.pl (copied) (copied from trunk/pstamp/scripts/pstamp_save_server_status.pl )
• pstamp/scripts/pstamp_server_status (modified) (5 diffs)

tags/ipp-20101215/ippTasks/pstamp.pro

@@ -905 +905 @@
     end
 end
+
+task pstamp.save.status
+    host        local
+
+    periods     -poll $LOADPOLL
+    periods     -exec 45
+    periods     -timeout 20
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.save.status.log
+
+        $run = pstamp_save_server_status.pl --update-link
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # echo nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end

tags/ipp-20101215/pstamp/scripts/Makefile.am

@@ -17 +17 @@
         pstamp_runcommand.sh \
         pstamp_server_status \
+        pstamp_save_server_status.pl \
         pstamp_webrequest.pl \
         pstamp_get_image_job.pl \
         psmkreq \
+        psstatus \
         pstampstopfaulted \
         pstamp_checkdependent.pl \

tags/ipp-20101215/pstamp/scripts/pstamp_server_status

@@ -25 +25 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-#pod2usage( -msg => "Required options: --first --stage",
-#          -exitval => 3) unless
-#    defined $first and
-#    defined $stage;
 
 # Look for programs we need
@@ -39 +35 @@
 }
 
+# XXX: Note under pantasks this will be the curent directory, so this
+# isn't necessary if the pstamp/web stuff is configured to point at the 
+# ipp build. But currently it's running out of Bill's build
 my $ipphome = "/home/panstarrs/ipp";
+my $status_cmd = "psstatus";
+
 $rundir = "$ipphome/pstamp" if !$rundir;
 
@@ -50 +51 @@
     exit 0;
 }
+
+my $now = `date -u`;
+
+print "<b>Status updated: &nbsp;&nbsp;&nbsp;</b> $now<br /><br />\n";
 
 my ($pts, $pantasks_script) = tempfile ('/tmp/pts.XXXX', UNLINK => !$save_temps);
@@ -138 +143 @@
         print "Task pstamp.job.run not found.<br />\n";
     }
+
+    # now run the script psstatus to check the status of running requests and finished requests
     print "<br /><b>Unfinished Requests</b><br />\n";
     print "<pre>\n";
-    system "/home/panstarrs/bills/ipp/tools/psstatus -r ";
+    system "$status_cmd --running";
     print "</pre>\n";
+
+if (0) {
+    # these are included in running requests above
+    print "<br /><b>Requests building results fileset</b><br/>\n";
+    print "<pre>\n";
+    system "$status_cmd --finishing";
+    print "</pre>\n";
+}
+
     print "<br /><b>Requests completed in last 24 hours (most recently completed first)</b><br />\n";
     print "<pre>\n";
-    # finished requests
-    system "/home/panstarrs/bills/ipp/tools/psstatus -f";
+    system "$status_cmd --finished";
     print "</pre>\n";
+
 } else {
     print "Task pstamp.request.run not found.\n";
@@ -153 +169 @@
 
 
-
 exit 0;