Changeset 4 for trunk


Ignore:
Timestamp:
Jun 13, 2012 5:30:32 PM (9 years ago)
Author:
us3
Message:

Fixed status calculation and added GFAC message to email

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cleanup.php

    r1 r4  
    1414$db              = '';
    1515$editXMLFilename = '';
     16$status          = '';
    1617
    1718function gfac_cleanup( $us3_db, $requestID, $gfac_link )
     
    3132   global $editXMLFilename;
    3233   global $submittime;
     34   global $status;
    3335
    3436   $db = $us3_db;
     
    535537
    536538   // Get GFAC status and message
    537    // For right now, since we don't get clear and concise message
    538    // $gfac_message = get_gfac_message( $gfacID );
    539    // if ( $gfac_message === false ) $gfac_message = "";
     539   // function get_gfac_message() also sets global $status
     540   $gfac_message = get_gfac_message( $gfacID );
     541   if ( $gfac_message === false ) $gfac_message = "";
    540542     
    541543   // Create a status to put in the subject line
     
    597599   Job Type        : $jobtype
    598600   GFAC Status     : $status
     601   GFAC Message    : $gfac_message
    599602   ";
    600603
    601    // This would change to ( $status != 'COMPLETE' ) or something like that.
    602    if ( $type != "success" ) $message .= "Error Message  :  $msg\n";
     604   if ( $type != "success" ) $message .= "Grid Ctrl Error :  $msg\n";
    603605
    604606   // Handle the error case where an error occurs before fetching the
     
    668670function parse_message( $xml )
    669671{
     672   global $status;
    670673   $status       = "";
    671674   $gfac_message = "";
Note: See TracChangeset for help on using the changeset viewer.