Index: trunk/gridctl.php
===================================================================
--- trunk/gridctl.php	(revision 32)
+++ trunk/gridctl.php	(revision 35)
@@ -20,10 +20,11 @@
 
 // Get data from global GFAC DB 
-$gLink = mysql_connect( $dbhost, $guser, $gpasswd );
-
-if ( ! mysql_select_db( $gDB, $gLink ) )
-{
-   write_log( "$self: Could not select DB $gDB - " . mysql_error() );
+$gLink = mysqli_connect( $dbhost, $guser, $gpasswd, $gDB );
+
+if ( ! $gLink )
+{
+   write_log( "$self: Could not select DB $gDB - " . mysqli_error() );
    mail_to_admin( "fail", "Internal Error: Could not select DB $gDB" );
+   sleep(300);
    exit();
 }
@@ -31,29 +32,33 @@
 $query = "SELECT gfacID, us3_db, cluster, status, queue_msg, " .
                 "UNIX_TIMESTAMP(time), time from analysis";
-$result = mysql_query( $query, $gLink );
+$result = mysqli_query( $gLink, $query );
 
 if ( ! $result )
 {
-   write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
-   mail_to_admin( "fail", "Query failed $query\n" .  mysql_error( $gLink ) );
+   write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
+   mail_to_admin( "fail", "Query failed $query\n" .  mysqli_error( $gLink ) );
    exit();
 }
 
-if ( mysql_num_rows( $result ) == 0 )
+if ( mysqli_num_rows( $result ) == 0 )
 {
 //write_log( "$self: analysis read got numrows==0" );
    exit();  // Nothing to do
 }
+//write_log( "$loghdr    gfac-analysis rows $nrows" );
 
 $me_devel  = preg_match( "/class_devel/", $class_dir );
+//echo "me_devel=$me_devel class_dir=$class_dir\n";
 
 while ( list( $gfacID, $us3_db, $cluster, $status, $queue_msg, $time, $updateTime ) 
-            = mysql_fetch_array( $result ) )
+            = mysqli_fetch_array( $result ) )
 {
    // If this entry does not match class/class_devel, skip processing
+//echo "  gfacID=$gfacID gf_status=$status\n";
 
    if ( preg_match( "/US3-A/i", $gfacID ) )
    {  // For thrift, job and gridctl must match
       $job_devel = preg_match( "/US3-ADEV/i", $gfacID );
+//echo "   THR: job_devel=$job_devel\n";
       if ( (  $me_devel  &&  !$job_devel )  ||
            ( !$me_devel  &&   $job_devel ) )
@@ -65,4 +70,5 @@
    else if ( $me_devel )
    {  // Local (us3iab/-local) and class_devel:  skip processing
+//echo "   LOC: me_devel=$me_devel\n";
       continue;
    }
@@ -99,4 +105,5 @@
 //write_log( "$loghdr status_in=$status_in" );
       $status     = aira_status( $gfacID, $status_in );
+//echo "$loghdr status_in=$status_in  status_ex=$status\n";
 if($status != $status_in )
  write_log( "$loghdr Set to $status from $status_in" );
@@ -110,4 +117,5 @@
       if ( $status_gw == 'COMPLETE' )
          $status     = $status_gw;
+//echo "$loghdr status_gw=$status_gw  status=$status\n";
 //write_log( "$loghdr non-AThrift status=$status status_gw=$status_gw" );
    }
@@ -119,4 +127,5 @@
       if ( $status_gw == 'COMPLETE'  ||  $status == 'UNKNOWN' )
          $status     = $status_gw;
+//echo "$loghdr status_lo=$status\n";
 //write_log( "$loghdr Local status=$status status_gw=$status_gw" );
    }
@@ -130,9 +139,9 @@
 
       $query2  = "UPDATE analysis SET status='ERROR' WHERE gfacID='$gfacID'";
-      $result2 = mysql_query( $query2, $gLink );
+      $result2 = mysqli_query( $gLink, $query2 );
       $status  = 'ERROR';
 
       if ( ! $result2 )
-         write_log( "$loghdr Query failed $query2 - " .  mysql_error( $gLink ) );
+         write_log( "$loghdr Query failed $query2 - " .  mysqli_error( $gLink ) );
 
    }
@@ -200,4 +209,5 @@
    }
 }
+mysqli_close( $gLink );
 
 exit();
@@ -235,8 +245,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='SUBMIT_TIMEOUT' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -271,8 +281,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='FAILED' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -311,8 +321,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='RUN_TIMEOUT' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -349,8 +359,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='FAILED' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -397,8 +407,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='DATA_TIMEOUT' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -445,8 +455,8 @@
    mail_to_admin( "hang", "$message - id: $gfacID" );
    $query = "UPDATE analysis SET status='FAILED' WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
 
    if ( ! $result )
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
 
    update_queue_messages( $message );
@@ -477,17 +487,17 @@
    // Double check that the gfacID exists
    $query  = "SELECT count(*) FROM analysis WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
   
    if ( ! $result )
    {
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
-      mail_to_admin( "fail", "Query failed $query\n" .  mysql_error( $gLink ) );
-      return;
-   }
-
-   list( $count ) = mysql_fetch_array( $result );
-
-if ($count==0)
-write_log( "$loghdr count = $count  gfacID = $gfacID" );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
+      mail_to_admin( "fail", "Query failed $query\n" .  mysqli_error( $gLink ) );
+      return;
+   }
+
+   list( $count ) = mysqli_fetch_array( $result );
+
+//if ($count==0)
+//write_log( "$loghdr count = $count  gfacID = $gfacID" );
    if ( $count == 0 ) return;
 
@@ -597,7 +607,7 @@
   }
 
-   $result =  mysql_query( $query, $gLink );
+   $result =  mysqli_query( $gLink, $query );
    if ( ! $result )
-      write_log( "$loghdr Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$loghdr Query failed $query - " .  mysqli_error( $gLink ) );
 
    if ( $message != 'NONE' )
@@ -619,20 +629,10 @@
    global $loghdr;
 
-   $us3_link = mysql_connect( $dbhost, $user, $passwd );
+   $us3_link = mysqli_connect( $dbhost, $user, $passwd, $us3_db );
 
    if ( ! $us3_link )
    {
-      write_log( "$loghdr could not connect: $dbhost, $user, $passwd" );
-      mail_to_admin( "fail", "Could not connect to $dbhost" );
-      return 0;
-   }
-
-
-   $result = mysql_select_db( $us3_db, $us3_link );
-
-   if ( ! $result )
-   {
-      write_log( "$loghdr could not select DB $us3_db" );
-      mail_to_admin( "fail", "Could not select DB $us3_db, $dbhost, $user, $passwd" );
+      write_log( "$loghdr could not connect: $dbhost, $user, $passwd, $us3_db" );
+      mail_to_admin( "fail", "Could not connect to $dbhost : $us3_db" );
       return 0;
    }
@@ -640,15 +640,15 @@
    $query = "SELECT HPCAnalysisRequestID, UNIX_TIMESTAMP(updateTime) " .
             "FROM HPCAnalysisResult WHERE gfacID='$gfacID'";
-   $result = mysql_query( $query, $us3_link );
+   $result = mysqli_query( $us3_link, $query );
 
    if ( ! $result )
    {
-      write_log( "$self: Query failed $query - " .  mysql_error( $us3_link ) );
-      mail_to_admin( "fail", "Query failed $query\n" .  mysql_error( $us3_link ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $us3_link ) );
+      mail_to_admin( "fail", "Query failed $query\n" .  mysqli_error( $us3_link ) );
       return 0;
    }
 
-   list( $requestID, $updateTime ) = mysql_fetch_array( $result );
-   mysql_close( $us3_link );
+   list( $requestID, $updateTime ) = mysqli_fetch_array( $result );
+   mysqli_close( $us3_link );
 
    return $requestID;
@@ -859,5 +859,4 @@
 //write_log( "$self  result: $result" );
 
-///////////////////////////////////////////////////////////////////
    $secwait    = 2;
    $num_try    = 0;
@@ -870,13 +869,9 @@
 write_log( "$me:   num_try=$num_try  secwait=$secwait" );
    }
-///////////////////////////////////////////////////////////////////
-//   if ( $result == ""  ||
-//        preg_match( "/^qstat: Unknown/", $result )  ||
-//        preg_match( "/ssh_exchange_id/", $result ) )
+
    if ( preg_match( "/^qstat: Unknown/", $result )  ||
         preg_match( "/ssh_exchange_id/", $result ) )
    {
-      write_log( "$self get_local_status: Local job $gfacID unknown" );
-//write_log( "$self get_local_status: result=$result" );
+      write_log( "$self get_local_status: Local job $gfacID unknown result=$result" );
       return 'UNKNOWN';
    }
@@ -937,20 +932,20 @@
    $query  = "SELECT id FROM analysis " .
              "WHERE gfacID = '$gfacID' ";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
    if ( ! $result )
    {
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
-      return;
-   }
-   list( $analysisID ) = mysql_fetch_array( $result );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
+      return;
+   }
+   list( $analysisID ) = mysqli_fetch_array( $result );
 
    // Insert message into queue_message table
    $query  = "INSERT INTO queue_messages SET " .
-             "message = '" . mysql_real_escape_string( $message, $gLink ) . "', " .
+             "message = '" . mysqli_real_escape_string( $gLink, $message ) . "', " .
              "analysisID = '$analysisID' ";
-   $result = mysql_query( $query, $gLink );
+   $result = mysqli_query( $gLink, $query );
    if ( ! $result )
    {
-      write_log( "$self: Query failed $query - " .  mysql_error( $gLink ) );
+      write_log( "$self: Query failed $query - " .  mysqli_error( $gLink ) );
       return;
    }
@@ -966,29 +961,19 @@
    global $us3_db;
 
-   $us3_link = mysql_connect( $dbhost, $user, $passwd );
+   $us3_link = mysqli_connect( $dbhost, $user, $passwd, $us3_db );
 
    if ( ! $us3_link )
    {
       write_log( "$self: could not connect: $dbhost, $user, $passwd" );
-      mail_to_admin( "fail", "Could not connect to $dbhost" );
+      mail_to_admin( "fail", "Could not connect to $dbhost : $us3_db" );
       return 0;
    }
 
-
-   $result = mysql_select_db( $us3_db, $us3_link );
-
-   if ( ! $result )
-   {
-      write_log( "$self: could not select DB $us3_db" );
-      mail_to_admin( "fail", "Could not select DB $us3_db, $dbhost, $user, $passwd" );
-      return 0;
-   }
-
    $query = "UPDATE HPCAnalysisResult SET " .
-            "lastMessage='" . mysql_real_escape_string( $message, $us3_link ) . "'" .
+            "lastMessage='" . mysqli_real_escape_string( $us3_link, $message ) . "'" .
             "WHERE gfacID = '$gfacID' ";
 
-   mysql_query( $query, $us3_link );
-   mysql_close( $us3_link );
+   mysqli_query( $us3_link, $query );
+   mysqli_close( $us3_link );
 }
 
@@ -1173,4 +1158,5 @@
       }
 
+//if ( $status != 'SUBMITTED' )
 //write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
       if ( $status != $status_gw )