Changes in / [3:1]


Ignore:
Location:
/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • /trunk

    • Property svn:ignore deleted
  • /trunk/gridctl.php

    r3 r1  
    1919if ( ! mysql_select_db( $gDB, $gLink ) )
    2020{
    21    write_log( "$self: Could not select DB $gDB - " . mysql_error() );
     21   write_log( "$self: Could not connect to DB $gDB" );
    2222   mail_to_admin( "fail", "Internal Error: Could not select DB $gDB" );
    2323   exit();
     
    412412
    413413    case 'COMPLETED'   :
    414     case 'DONE'   :
    415414      $query   = "UPDATE analysis SET status='COMPLETE' WHERE gfacID='$gfacID'";
    416415      $message = "Job status request reports job is COMPLETE";
     
    439438
    440439    default            :
    441       // We shouldn't ever get here
    442440      $query   = "";
    443441      $message = "Job status was not recognized - $job_status";
    444       write_log( "$self - update_job_status: " .
    445                  "Job status was not recognized - $job_status\n" .
    446                  "gfacID = $gfacID\n" );
    447442      break;
    448443
     
    540535   // Parse the result
    541536   $gfac_status = parse_response( $xml );
    542 
    543    // This may not seem like the best place to do this, but here we have
    544    // the xml straight from GFAC
    545    $status_types = array('SUBMITTED',
    546                          'SUBMITED',
    547                          'INITIALIZED',
    548                          'PENDING',
    549                          'ACTIVE',
    550                          'COMPLETED',
    551                          'DONE',
    552                          'DATA',
    553                          'CANCELED',
    554                          'CANCELLED',
    555                          'FAILED',
    556                          'UNKNOWN');
    557    if ( ! in_array( $gfac_status, $status_types ) )
    558       mail_to_admin( 'debug', "gfacID: /$gfacID/\n" .
    559                               "XML:    /$xml/\n"    .
    560                               "Status: /$gfac_status/\n" );
    561537
    562538   return $gfac_status;
     
    755731   $headers  = "From: $org_name Admin<$admin_email>"     . "\n";
    756732   $headers .= "Cc: $org_name Admin<$admin_email>"       . "\n";
    757    $headers .= "Bcc: Dan Zollars<dzollars@gmail.com>"    . "\n";     // make sure
    758733
    759734   // Set the reply address
  • /trunk/manage-us3-pipe.php

    r3 r1  
    4343   global $user;
    4444   global $passwd;
    45    global $self;
    4645
    4746   $list                   = explode( ": ", $msg );
     
    5756   if ( ! $resource )
    5857   {
    59       write_log( "$self process(): Could not connect to MySQL - " . mysql_error() );
     58      write_log( "$self process(): Could not connect to DB" );
    6059      write_log( "$self process(): original msg - $msg" );
    6160      return;
Note: See TracChangeset for help on using the changeset viewer.