Changes in trunk [3:1]

Location:

trunk

Files:

• gridctl.php (modified) (5 diffs)
• manage-us3-pipe.php (modified) (2 diffs)

trunk/gridctl.php

@@ -19 +19 @@
 if ( ! mysql_select_db( $gDB, $gLink ) )
 {
-   write_log( "$self: Could not select DB $gDB - " . mysql_error() );
+   write_log( "$self: Could not connect to DB $gDB" );
    mail_to_admin( "fail", "Internal Error: Could not select DB $gDB" );
    exit();
@@ -412 +412 @@
 
     case 'COMPLETED'   :
-    case 'DONE'   :
       $query   = "UPDATE analysis SET status='COMPLETE' WHERE gfacID='$gfacID'";
       $message = "Job status request reports job is COMPLETE";
@@ -439 +438 @@
 
     default            :
-      // We shouldn't ever get here
       $query   = "";
       $message = "Job status was not recognized - $job_status";
-      write_log( "$self - update_job_status: " .
-                 "Job status was not recognized - $job_status\n" .
-                 "gfacID = $gfacID\n" );
       break;
 
@@ -540 +535 @@
    // Parse the result
    $gfac_status = parse_response( $xml );
-
-   // This may not seem like the best place to do this, but here we have
-   // the xml straight from GFAC
-   $status_types = array('SUBMITTED',
-                         'SUBMITED',
-                         'INITIALIZED',
-                         'PENDING',
-                         'ACTIVE',
-                         'COMPLETED',
-                         'DONE',
-                         'DATA',
-                         'CANCELED',
-                         'CANCELLED',
-                         'FAILED',
-                         'UNKNOWN');
-   if ( ! in_array( $gfac_status, $status_types ) )
-      mail_to_admin( 'debug', "gfacID: /$gfacID/\n" .
-                              "XML:    /$xml/\n"    . 
-                              "Status: /$gfac_status/\n" );
 
    return $gfac_status;
@@ -755 +731 @@
    $headers  = "From: $org_name Admin<$admin_email>"     . "\n";
    $headers .= "Cc: $org_name Admin<$admin_email>"       . "\n";
-   $headers .= "Bcc: Dan Zollars<dzollars@gmail.com>"    . "\n";     // make sure
 
    // Set the reply address

trunk/manage-us3-pipe.php

@@ -43 +43 @@
    global $user;
    global $passwd;
-   global $self;
 
    $list                   = explode( ": ", $msg );
@@ -57 +56 @@
    if ( ! $resource )
    {
-      write_log( "$self process(): Could not connect to MySQL - " . mysql_error() );
+      write_log( "$self process(): Could not connect to DB" );
       write_log( "$self process(): original msg - $msg" );
       return;