Changeset 4

Timestamp:

Jun 13, 2012, 5:30:32 PM (12 years ago)

Author:

us3

Message:

Fixed status calculation and added GFAC message to email

File:

• trunk/cleanup.php (modified) (5 diffs)

trunk/cleanup.php

@@ -14 +14 @@
 $db              = '';
 $editXMLFilename = '';
+$status          = '';
 
 function gfac_cleanup( $us3_db, $requestID, $gfac_link )
@@ -31 +32 @@
    global $editXMLFilename;
    global $submittime;
+   global $status;
 
    $db = $us3_db;
@@ -535 +537 @@
 
    // Get GFAC status and message
-   // For right now, since we don't get clear and concise message
-   // $gfac_message = get_gfac_message( $gfacID );
-   // if ( $gfac_message === false ) $gfac_message = "";
+   // function get_gfac_message() also sets global $status
+   $gfac_message = get_gfac_message( $gfacID );
+   if ( $gfac_message === false ) $gfac_message = "";
       
    // Create a status to put in the subject line
@@ -597 +599 @@
    Job Type        : $jobtype
    GFAC Status     : $status
+   GFAC Message    : $gfac_message
    ";
 
-   // This would change to ( $status != 'COMPLETE' ) or something like that.
-   if ( $type != "success" ) $message .= "Error Message  :  $msg\n";
+   if ( $type != "success" ) $message .= "Grid Ctrl Error :  $msg\n";
 
    // Handle the error case where an error occurs before fetching the
@@ -668 +670 @@
 function parse_message( $xml )
 {
+   global $status;
    $status       = "";
    $gfac_message = "";