Changeset 40 for trunk


Ignore:
Timestamp:
Apr 28, 2019, 3:00:50 PM (6 years ago)
Author:
gegorbet
Message:

more time information in error,completion emails

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/cleanup.php

    r39 r40  
    3232   global $editXMLFilename;
    3333   global $submittime;
     34   global $endtime;
    3435   global $status;
    3536   global $stderr;
    … …  
    7374   list( $personID ) = mysqli_fetch_array( $result );
    7475
    75    $query  = "SELECT clusterName, submitTime, queueStatus, analType "              .
    76              "FROM HPCAnalysisRequest h, HPCAnalysisResult r "                   .
    77              "WHERE h.HPCAnalysisRequestID=$requestID "                          .
     76   $query  = "SELECT clusterName, submitTime, queueStatus, analType " .
     77             "FROM HPCAnalysisRequest h, HPCAnalysisResult r "        .
     78             "WHERE h.HPCAnalysisRequestID=$requestID "               .
    7879             "AND h.HPCAnalysisRequestID=r.HPCAnalysisRequestID";
    7980
    … …  
    9596
    9697   // Get the GFAC ID
    97    $query = "SELECT HPCAnalysisResultID, gfacID FROM HPCAnalysisResult " .
     98   $query = "SELECT HPCAnalysisResultID, gfacID, endTime FROM HPCAnalysisResult " .
    9899            "WHERE HPCAnalysisRequestID=$requestID";
    99100
    … …  
    107108   }
    108109
    109    list( $HPCAnalysisResultID, $gfacID ) = mysqli_fetch_array( $result );
     110   list( $HPCAnalysisResultID, $gfacID, $endtime ) = mysqli_fetch_array( $result );
    110111
    111112   // Get data from global GFAC DB then insert it into US3 DB
    … …  
    664665   global $email_address;
    665666   global $submittime;
     667   global $endtime;
    666668   global $queuestatus;
    667669   global $status;
    … …  
    742744
    743745   // Try to avoid spam filters
    744    $now = time();
     746   $now      = time();
     747   $tnow     = date( 'Y-m-d H:i:s' );
    745748   $headers .= "Message-ID: <" . $now . "cleanup@$dbhost>\n";
    746749   $headers .= "X-Mailer: PHP v" . phpversion()         . "\n";
    … …  
    753756
    754757   Submission Time : $submittime
     758   Job End Time    : $endtime
     759   Mail Time       : $tnow
    755760   LIMS Host       : $limshost
    756761   Analysis ID     : $gfacID

  • trunk/cleanup_gfac.php

    r35 r40  
    3333   global $editXMLFilename;
    3434   global $submittime;
     35   global $endtime;
    3536   global $status;
    3637   global $stdout;
    … …  
    7677             "WHERE h.HPCAnalysisRequestID=$requestID";
    7778   */
    78    $query  = "SELECT clusterName, submitTime, queueStatus, method "              .
     79   $query  = "SELECT clusterName, submitTime, queueStatus, analType "            .
    7980             "FROM HPCAnalysisRequest h, HPCAnalysisResult r "                   .
    8081             "WHERE h.HPCAnalysisRequestID=$requestID "                          .
    … …  
    9899
    99100   // Get the GFAC ID
    100    $query = "SELECT HPCAnalysisResultID, gfacID FROM HPCAnalysisResult " .
     101   $query = "SELECT HPCAnalysisResultID, gfacID, endTime FROM HPCAnalysisResult " .
    101102            "WHERE HPCAnalysisRequestID=$requestID";
    102103
    … …  
    110111   }
    111112
    112    list( $HPCAnalysisResultID, $gfacID ) = mysqli_fetch_array( $result );
     113   list( $HPCAnalysisResultID, $gfacID, $endtime ) = mysqli_fetch_array( $result );
    113114
    114115   ////////

  • trunk/gridctl.php

    r39 r40  
    10011001   // Try to avoid spam filters
    10021002   $now = time();
     1003   $tnow = date( 'Y-m-d H:i:s' );
    10031004   $headers .= "Message-ID: <" . $now . "gridctl@$dbhost>$requestID\n";
    10041005   $headers .= "X-Mailer: PHP v" . phpversion()         . "\n";
    … …  
    10101011   UltraScan job error notification from gridctl.php:
    10111012
    1012    Update Time    :  $updateTime  [ now=$now ]
     1013   Update Time    :  $updateTime  [ now=$tnow ]
    10131014   GFAC Status    :  $status
    10141015   Cluster        :  $cluster
Note: See TracChangeset for help on using the changeset viewer.