Changeset 29

Timestamp:

May 18, 2017, 10:50:55 AM (7 years ago)

Author:

gegorbet

Message:

gridctl refinement to handle *-local job cleanup

File:

• trunk/gridctl.php (modified) (2 diffs)

trunk/gridctl.php

@@ -497 +497 @@
 
    if ( preg_match( "/US3-A/i", $gfacID ) )
-   {
+   {  // Airavata job:  clean up if prod/devel match
       $job_devel = preg_match( "/US3-ADEV/i", $gfacID );
       if ( ( !$me_devel  &&  !$job_devel )  ||
@@ -507 +507 @@
 //write_log( "$loghdr RTN FR aira_cleanup()" );
    }
-   else if ( ! $me_local )
-   {
-write_log( "$loghdr CALLING gfac_cleanup() reqID=$requestID" );
+   else
+   {  // Non-airavata job:  clean up in a non-aira way
+write_log( "$loghdr calling gfac_cleanup() reqID=$requestID" );
       gfac_cleanup( $us3_db, $requestID, $gLink );
    }