Changeset 25 for trunk


Ignore:
Timestamp:
Jan 13, 2017, 1:30:29 PM (8 years ago)
Author:
gegorbet
Message:

merge us3iab/airavata gridctl code

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/cleanup.php

    r24 r25  
    1717function aira_cleanup( $us3_db, $reqID, $gfac_link )
    1818{
     19   global $org_domain;
    1920   global $dbhost;
    2021   global $user;
     
    141142   list( $status, $cluster, $id ) = mysql_fetch_array( $result );
    142143
    143    if ( $cluster == 'bcf-local'  || $cluster == 'alamo-local' )
     144   $is_us3iab  = preg_match( "/us3iab/", $cluster );
     145   $is_local   = preg_match( "/-local/", $cluster );
     146
     147   if ( $is_us3iab  ||  $is_local )
    144148   {
    145149         $clushost = $cluster;
     
    191195   $fn_tarfile = "analysis-results.tar";
    192196   $num_try    = 0;
     197$len1 = strlen( $fn_tarfile );
     198write_log( "$me: fn_tarfile=$fn_tarfile  len(tar)=$len1" );
    193199   while ( ! file_exists( $fn_tarfile ) && $num_try < 3 )
    194200   {
    195201      sleep( 10 );
    196202      $num_try++;
     203write_log( "$me:  tar-exists: num_try=$num_try" );
    197204   }
    198205
     
    200207   foreach ( $ofiles as $ofile )
    201208   {
    202       if ( preg_match( "/.*stderr$/", $ofile ) )
     209      if ( preg_match( "/^" . $gfacID . ".*stderr$/", $ofile ) )
    203210         $fn_stderr  = $ofile;
    204       if ( preg_match( "/.*stdout$/", $ofile ) )
     211      if ( preg_match( "/^" . $gfacID . ".*stdout$/", $ofile ) )
    205212         $fn_stdout  = $ofile;
    206213//write_log( "$me:    ofile=$ofile" );
     
    654661   global $editXMLFilename;
    655662   global $stdout;
     663   global $org_domain;
    656664
    657665global $me;
     
    697705   $limshost    = $dbhost;
    698706   if ( $limshost == 'localhost' )
     707   {
    699708      $limshost    = gethostname();
     709      if ( ! preg_match( "/\./", $limshost ) )
     710         $limshost    = $limshost . $org_domain;
     711   }
    700712
    701713   // Parse the editXMLFilename
     
    841853   global $db;
    842854   global $status;
    843 
    844    // Figure out local working directory
    845    if ( ! is_dir( "$work/$gfacID" ) ) mkdir( "$work/$gfacID", 0770 );
    846    $pwd = chdir( "$work/$gfacID" );
     855   $is_us3iab  = preg_match( "/us3iab/", $cluster );
    847856
    848857   // Figure out remote directory
    849858   $remoteDir = sprintf( "$work_remote/$db-%06d", $requestID );
     859write_log( "$me: is_us3iab=$is_us3iab  remoteDir=$remoteDir" );
    850860
    851861   // Get stdout, stderr, output/analysis-results.tar
    852862   $output = array();
    853 //   $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stdout . 2>&1";
    854 //
    855 //   exec( $cmd, $output, $stat );
    856 //   if ( $stat != 0 )
    857 //      write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    858 //     
    859 //   $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stderr . 2>&1";
    860 //   exec( $cmd, $output, $stat );
    861 //   if ( $stat != 0 )
    862 //      write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    863 
    864    $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/output/analysis-results.tar . 2>&1";
    865    exec( $cmd, $output, $stat );
    866    if ( $stat != 0 )
    867       write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    868 
    869    $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stdout . 2>&1";
    870    exec( $cmd, $output, $stat );
    871    if ( $stat != 0 )
    872    {
    873       write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    874       sleep( 10 );
    875       write_log( "$me: RETRY" );
     863
     864   if ( $is_us3iab == 0 )
     865   {
     866      // Figure out local working directory
     867      if ( ! is_dir( "$work/$gfacID" ) ) mkdir( "$work/$gfacID", 0770 );
     868      $pwd = chdir( "$work/$gfacID" );
     869
     870      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/output/analysis-results.tar . 2>&1";
     871
    876872      exec( $cmd, $output, $stat );
    877       if ( $stat != 0 ) 
     873      if ( $stat != 0 )
    878874         write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    879    }
    880      
    881    $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stderr . 2>&1";
    882    exec( $cmd, $output, $stat );
    883    if ( $stat != 0 )
    884    {
    885       write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    886       sleep( 10 );
    887       write_log( "$me: RETRY" );
     875
     876      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stdout . 2>&1";
     877
    888878      exec( $cmd, $output, $stat );
    889       if ( $stat != 0 )
     879      if ( $stat != 0 )
     880      {
    890881         write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
    891    }
     882         sleep( 10 );
     883         write_log( "$me: RETRY" );
     884         exec( $cmd, $output, $stat );
     885         if ( $stat != 0 )
     886            write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
     887      }
     888
     889      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stderr . 2>&1";
     890
     891      exec( $cmd, $output, $stat );
     892      if ( $stat != 0 )
     893      {
     894         write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
     895         sleep( 10 );
     896         write_log( "$me: RETRY" );
     897         exec( $cmd, $output, $stat );
     898         if ( $stat != 0 )
     899            write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
     900      }
     901   }
     902   else
     903   {
     904      $pwd = chdir( "$remoteDir" );
     905write_log( "$me: IS US3IAB: pwd=$pwd $remoteDir");
     906   }
     907
    892908
    893909   // Write the files to gfacDB
    894910
    895    if ( file_exists( "stderr" ) ) $stderr  = file_get_contents( "stderr" );
     911   if ( file_exists( "stderr"  ) )
     912   {  // Filter stderr to not have libnnls debug lines
     913      exec( "mv stderr stderr+nnls", $output, $stat );
     914      exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );
     915      $stderr  = file_get_contents( "stderr" );
     916   }
     917   else
     918      $stderr  = "";
    896919   if ( file_exists( "stdout" ) ) $stdout  = file_get_contents( "stdout" );
    897    if ( file_exists( "analysis-results.tar" ) )
    898       $tarfile = file_get_contents( "analysis-results.tar" );
    899 
     920   $fn1_tarfile = "analysis-results.tar";
     921   $fn2_tarfile = "output/" . $fn1_tarfile;
     922   if ( file_exists( $fn1_tarfile ) )
     923      $tarfile = file_get_contents( $fn1_tarfile );
     924   else if ( file_exists( $fn2_tarfile ) )
     925      $tarfile = file_get_contents( $fn2_tarfile );
     926
     927   $lense = strlen( $stderr );
     928   if ( $lense > 1000000 )
     929   { // Replace exceptionally large stderr with smaller version
     930      exec( "mv stderr stderr-orig", $output, $stat );
     931      exec( "head -n 5000 stderr-orig >stderr-h", $output, $stat );
     932      exec( "tail -n 5000 stderr-orig >stderr-t", $output, $stat );
     933      exec( "cat stderr-h stderr-t >stderr", $output, $stat );
     934      $stderr  = file_get_contents( "stderr" );
     935   }
     936$lent = strlen( $tarfile );
     937write_log( "$me: tarfile size: $lent");
     938$lene = strlen( $stderr );
     939write_log( "$me: stderr size: $lene  (was $lense)");
     940$leno = strlen( $stdout );
     941write_log( "$me: stdout size: $leno");
     942$estarf=mysql_real_escape_string($tarfile,$gfac_link);
     943$lenf = strlen($estarf);
     944write_log( "$me: es-tarfile size: $lenf");
     945$esstdo=mysql_real_escape_string($stdout,$gfac_link);
     946$leno = strlen($esstdo);
     947write_log( "$me: es-stdout size: $leno");
     948$esstde=mysql_real_escape_string($stderr,$gfac_link);
     949$lene = strlen($esstde);
     950write_log( "$me: es-stderr size: $lene");
    900951   $query = "UPDATE analysis SET " .
    901952            "stderr='"  . mysql_real_escape_string( $stderr,  $gfac_link ) . "'," .
  • trunk/cleanup_aira.php

    r18 r25  
    1414$me              = 'cleanup_aira.php';
    1515$class_dir       = $class_dir_p;
    16 include_once "cleanup.php";
     16include_once "$us3bin/cleanup.php";
    1717
    1818?>
  • trunk/cleanup_gfac.php

    r23 r25  
    159159//write_log( "$me:     db=$db; requestID=$requestID; status=$status; cluster=$cluster" );
    160160
    161    if ( $cluster == 'bcf-local'  ||  $cluster == 'alamo-local' )
    162    {
    163       $clushost = $cluster;
    164       $clushost = preg_replace( "/\-local/", "", $clushost );
     161//   if ( $cluster == 'bcf-local'  ||  $cluster == 'alamo-local' )
     162   if ( preg_match( "/\-local/", $cluster )  ||
     163        preg_match( "/us3iab/",  $cluster ) )
     164   {
     165//      $clushost = $cluster;
     166//      $clushost = preg_replace( "/\-local/", "", $clushost );
     167      $parts    = explode( "-", $cluster );
     168      $clushost = $parts[ 0 ];
    165169      get_local_files( $gfac_link, $clushost, $requestID, $id, $gfacID );
    166    }
     170write_log( "$me:     clushost=$clushost  reqID=$requestID get_local_files() gfacID=$gfacID" );
     171   }
     172else
     173write_log( "$me:     NO get_local_files()" );
    167174
    168175   $query = "SELECT id, stderr, stdout, tarfile FROM analysis " .
     
    328335   file_put_contents( $message_filename, $message_log, FILE_APPEND );
    329336  // mysql_close( $gfac_link );
    330 //write_log( "$me: *messages.txt written" );
     337write_log( "$me: *messages.txt written" );
    331338
    332339   /////////
     
    346353      return( -1 );
    347354   }
    348 //write_log( "$me: HPCAnalysisResult stderr,stdout updated" );
    349355
    350356   // Save the tarfile and expand it
     
    368374   chdir( "$work/$gfacID" );
    369375
    370    $f = fopen( "analysis.tar", "w" );
     376   $f = fopen( "analysis-results.tar", "w" );
    371377   fwrite( $f, $tarfile );
    372378   fclose( $f );
    373 write_log( "$me: analysis.tar file written to work dir" );
     379//write_log( "$me: analysis-results.tar file written to work dir" );
    374380
    375381   $tar_out = array();
    376    exec( "tar -xf analysis.tar 2>&1", $tar_out, $err );
     382   exec( "tar -xf analysis-results.tar 2>&1", $tar_out, $err );
    377383
    378384   if ( $err != 0 )
     
    461467                  "noiseGUID='$noiseGUID'," .
    462468                  "modelGUID='$modelGUID'," .
    463                   "editedDataID=1, "        .
     469                  "editedDataID=2, "        .
    464470                  "modelID=1, "             .
    465471                  "noiseType='$type',"      .
     
    670676   mail_to_user( "success", "" );
    671677}
    672 
    673678?>
  • trunk/cluster_status.php

    r23 r25  
    44include "$us3bin/listen-config.php";
    55
    6 $xml  = get_data();
    7 
    8 if ( $xml != "" )
    9    parse( $xml );
     6if ( ! preg_match( "/localhost/", $dbhost ) )
     7{
     8   $xml  = get_data();
     9
     10   if ( $xml != "" )
     11      parse( $xml );
     12}
    1013
    1114$data = array();
     
    165168   global $self;
    166169   global $data;
    167 
    168    $clusters = array( "alamo", "lonestar5", "stampede",
    169                       "comet", "gordon", "jureca", "jacinto" );
    170 //   $clusters = array( "alamo", "lonestar5", "stampede",
    171 //                      "comet", "gordon", "jureca"            );
     170   global $dbhost;
     171   global $org_domain;
     172
     173   if ( preg_match( "/localhost/", $dbhost ) )
     174   {
     175      if ( preg_match( "/attlocal/", $org_domain ) )
     176         $clusters = array( "us3iab-devel" );
     177      else
     178         $clusters = array( "us3iab-node0" );
     179   }
     180   else
     181   {
     182      $clusters = array( "alamo", "lonestar5", "stampede", "comet",
     183                         "gordon", "jureca", "jacinto" );
     184   }
     185
    172186   foreach ( $clusters as $clname )
    173187   {
    174188      $a      = Array();
     189//echo "$self:   clname=$clname\n";
     190
    175191      switch( $clname )
    176192      {
    177          case 'alamo':
    178          {
    179             $host   = "us3@alamo.uthscsa.edu";
    180             $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
     193         case 'us3iab-node0':
     194         case 'us3iab-node1':
     195         case 'us3iab-devel':
     196         {
     197            $qstat  = `/usr/bin/qstat -B 2>&1|tail -1`;
     198
    181199            $sparts = preg_split( '/\s+/', $qstat );
    182200            $que    = $sparts[ 3 ];
     
    189207            break;
    190208         }
     209         case 'alamo':
     210         {
     211            $host   = "us3@alamo.uthscsa.edu";
     212            $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
     213            $sparts = preg_split( '/\s+/', $qstat );
     214            $que    = $sparts[ 3 ];
     215            $run    = $sparts[ 4 ];
     216            $sta    = $sparts[ 10 ];
     217            if ( $sta == "Active" )
     218               $sta    = "up";
     219            else
     220               $sta    = "down";
     221            break;
     222         }
    191223         case 'jacinto':
    192224         {
     
    289321      $a[ 'running' ] = $run;
    290322      $a[ 'status'  ] = $sta;
     323//echo "$self:  $clname  $que $run $sta\n";
    291324
    292325      $data[] = $a;
  • trunk/gridctl.php

    r22 r25  
    11<?php
     2
     3$us3bin = exec( "ls -d ~us3/lims/bin" );
     4include_once "$us3bin/listen-config.php";
     5//include "$us3bin/cleanup_aira.php";
     6//include "$us3bin/cleanup_gfac.php";
    27
    38// Global variables
     
    5358      if ( (  $me_devel  &&  !$job_devel )  ||
    5459           ( !$me_devel  &&   $job_devel ) )
    55       {  // If job not from appropriate Airavata server, skip processing
     60      {  // Job type and Airavata server mismatch: skip processing
    5661         continue;
    5762      }
    58    }
    59    else if ( $me_devel )
    60    {  // For non-thrift and development, skip
    61       continue;
    6263   }
    6364
     
    7879   }
    7980
    80    $awork = array();
    81    $awork = explode( "-", $gfacID );
    82    $gfacLabl = $awork[0] . "-" . $awork[1] . "-" . $awork[2];
     81//   $awork = array();
     82//   $awork = explode( "-", $gfacID );
     83//   $gfacLabl = $awork[0] . "-" . $awork[1] . "-" . $awork[2];
     84   $gfacLabl = $gfacID;
    8385   $loghdr   = $self . ":" . $gfacLabl . "...:";
    84    $status_in = $status;
    85    $status_gw = $status;
    8686   $status_ex = $status;
    8787
     
    9191   {
    9292      $status_in  = $status;
     93//write_log( "$loghdr status_in=$status_in" );
    9394      $status     = aira_status( $gfacID, $status_in );
    9495if($status != $status_in )
    9596write_log( "$loghdr Set to $status from $status_in" );
    9697   }
    97    else
     98   else if ( is_gfac_job( $gfacID ) )
    9899   {
    99100      $status_gw  = $status;
     
    102103      if ( $status_gw == 'COMPLETE' )
    103104         $status     = $status_gw;
    104 write_log( "$loghdr non-AThrift status=$status status_gw=$status_gw" );
     105//write_log( "$loghdr non-AThrift status=$status status_gw=$status_gw" );
     106   }
     107   else
     108   {
     109      $status_gw  = $status;
     110      $status     = get_local_status( $gfacID );
     111      if ( $status_gw == 'COMPLETE'  ||  $status == 'UNKNOWN' )
     112         $status     = $status_gw;
     113//write_log( "$loghdr Local status=$status status_gw=$status_gw" );
    105114   }
    106115
     
    160169      case "COMPLETED":
    161170      case "COMPLETE":
     171write_log( "$loghdr   COMPLETE gfacID=$gfacID" );
    162172         complete();
    163173         break;
     
    173183         if ( is_aira_job( $gfacID ) )
    174184         {
    175             $status_ex    = getExperimentStatus( $gfacID );
    176 write_log( "$loghdr     status=$status status_ex=$status_ex" );
    177             if ( $status_ex === 'COMPLETED' )
    178                complete();
     185            complete();
    179186         }
     187write_log( "$loghdr   FINISHED gfacID=$gfacID" );
    180188      case "PROCESSING":
    181189      default:
     
    207215      if ( ! in_array( $job_status, array( 'SUBMITTED', 'INITIALIZED', 'PENDING' ) ) )
    208216      {
    209 //write_log( "$loghdr submitted:job_status=$job_status" );
     217write_log( "$loghdr submitted:job_status=$job_status" );
    210218         update_job_status( $job_status, $gfacID );
    211219      }
     
    242250   if ( ! in_array( $job_status, array( 'SUBMITTED', 'INITIALIZED', 'PENDING' ) ) )
    243251   {
    244 //write_log( "$loghdr submit_timeout:job_status=$job_status" );
    245252      update_job_status( $job_status, $gfacID );
    246253      return;
     
    286293
    287294      if ( ! in_array( $job_status, array( 'ACTIVE', 'RUNNING', 'STARTED' ) ) )
    288       {
    289 //write_log( "$loghdr running:job_status=$job_status" );
    290295         update_job_status( $job_status, $gfacID );
    291       }
    292296
    293297      return;
     
    322326   if ( ! in_array( $job_status, array( 'ACTIVE', 'RUNNING', 'STARTED' ) ) )
    323327   {
    324 //write_log( "$loghdr run_timeout:job_status=$job_status" );
    325328      update_job_status( $job_status, $gfacID );
    326329      return;
     
    365368      if ( $job_status != 'DATA' )
    366369      {
    367 //write_log( "$loghdr wait_data:job_status=$job_status" );
    368370         update_job_status( $job_status, $gfacID );
    369371         return;
     
    410412   if ( $job_status != 'DATA' )
    411413   {
    412 //write_log( "$loghdr data_timeout:job_status=$job_status" );
    413414      update_job_status( $job_status, $gfacID );
    414415      return;
     
    463464   global $us3_db;
    464465   global $loghdr;
    465    global $class_dir;
    466466
    467467   // Double check that the gfacID exists
     
    488488
    489489   $me_devel  = preg_match( "/class_devel/", $class_dir );
     490   $me_local  = preg_match( "/class_local/", $class_dir );
    490491
    491492   if ( preg_match( "/US3-A/i", $gfacID ) )
     
    494495      if ( ( !$me_devel  &&  !$job_devel )  ||
    495496           (  $me_devel  &&   $job_devel ) )
    496       {  // If job from appropriate Airavata server, process it
     497      {  // Job is of same type (prod/devel) as Server: process it
    497498//write_log( "$loghdr CALLING aira_cleanup()" );
    498499         aira_cleanup( $us3_db, $requestID, $gLink );
     
    500501//write_log( "$loghdr RTN FR aira_cleanup()" );
    501502   }
    502 
    503    else if ( ! $me_devel )
    504    {  // If this is gridctl_pro and gfac (jureca), do GFAC cleanup
    505 //write_log( "$loghdr CALLING gfac_cleanup()" );
     503   else if ( ! $me_local )
     504   {
     505write_log( "$loghdr CALLING gfac_cleanup() reqID=$requestID" );
    506506      gfac_cleanup( $us3_db, $requestID, $gLink );
    507507   }
     
    521521    case 'SUBMITED'    :
    522522    case 'INITIALIZED' :
     523    case 'UPDATING'    :
     524    case 'PENDING'     :
    523525      $query   = "UPDATE analysis SET status='SUBMITTED' WHERE gfacID='$gfacID'";
    524       $message = "Job status request reports job is " . $job_status;
    525 //write_log( "$loghdr update_job_status(SUBM) job_status=$job_status" );
     526      $message = "Job status request reports job is SUBMITTED";
    526527      break;
    527528
     
    569570      $query   = "UPDATE analysis SET status='ERROR' WHERE gfacID='$gfacID'";
    570571      $message = "Job status request reports job is not in the queue";
    571       break;
    572 
    573     case 'UPDATING'    :
    574     case 'PENDING'     :
    575       $message = "Job status request reports job is " . $job_status;
    576572      break;
    577573
     
    695691
    696692      $gfac_status  = standard_status( $status_ex );
    697 write_log( "$loghdr get_gfac_status: status_ex=$status_ex gfac_status=$gfac_status" );
    698693      return $gfac_status;
    699694   }
    700695
    701696   else if ( ! is_gfac_job( $gfacID ) )
     697   {
    702698      return false;
     699   }
    703700
    704701   $url = "$serviceURL/jobstatus/$gfacID";
     
    758755   {
    759756      // Then it's not a GFAC job
    760       return false;
     757      $job_status = get_local_status( $gfacID );
     758      return $job_status;
    761759   }
    762760
     
    825823   global $self;
    826824
    827    $system = "$cluster.uthscsa.edu";
    828    $system = preg_replace( "/\-local/", "", $system );
    829    $cmd    = "/usr/bin/ssh -x us3@$system qstat -a $gfacID 2>&1";
     825   $cmd    = "/usr/bin/qstat -a $gfacID 2>&1|tail -n 1";
     826   if ( ! preg_match( "/us3iab/", $cluster ) )
     827   {
     828      $system = "$cluster.uthscsa.edu";
     829      $system = preg_replace( "/\-local/", "", $system );
     830      $cmd    = "/usr/bin/ssh -x us3@$system " . $cmd;
     831   }
    830832
    831833   $result = exec( $cmd );
     
    834836   {
    835837      write_log( "$self get_local_status: Local job $gfacID unknown" );
     838write_log( "$self get_local_status: result=$result" );
    836839      return 'UNKNOWN';
    837840   }
    838841
    839842   $values = preg_split( "/\s+/", $result );
    840 //   write_log( "$self: get_local_status: job status = /{$values[9]}/");
     843//write_log( "$self: get_local_status: job status = /{$values[9]}/");
    841844   switch ( $values[ 9 ] )
    842845   {
     
    9991002      case 'canceled' :
    10001003         $status      = 'CANCELED';
     1004         break;
     1005
     1006         $status      = 'DATA';
    10011007         break;
    10021008
     
    10431049   global $self;
    10441050   global $loghdr;
    1045    global $class_dir;
    10461051//echo "a_st: st_in$status_in : $gfacID\n";
    10471052   //$status_gw = standard_status( $status_in );
     
    10541059                  (  $me_devel  &&   $job_devel ) );
    10551060
    1056 //write_log( "$loghdr  gfacID=$gfacID  devmatch=$devmatch" );
    1057 //write_log( "$loghdr   me_d=$me_devel  jo_d=$job_devel  cd=$class_dir" );
    10581061   if ( preg_match( "/US3-A/i", $gfacID )  &&  $devmatch )
    1059    {  // Airavata job and development/production type is right
     1062   {
    10601063      $status_ex = getExperimentStatus( $gfacID );
    1061 //write_log( "$loghdr status_ex $status_ex" );
    10621064
    10631065      if ( $status_ex == 'COMPLETED' )
     
    11011103      }
    11021104
    1103 if(preg_match("/US3-A/i",$gfacID))
    1104 //if(preg_match("/US3-ADEV/i",$gfacID))
    1105 write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
    11061105//write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
    1107 //write_log( "  me_d=$me_devel jo_d=$job_devel dm=$devmatch cd=$class_dir" );
    11081106      if ( $status != $status_gw )
    11091107      {
  • trunk/manage-us3-pipe.php

    r18 r25  
    33$us3bin = exec( "ls -d ~us3/lims/bin" );
    44include "$us3bin/listen-config.php";
    5 include "/srv/www/htdocs/common/class/experiment_status.php";
     5include "$class_dir/experiment_status.php";
    66
    77write_log( "$self: Starting" );
  • trunk/update_notice.php

    r18 r25  
    2424$dbhost     = "localhost";
    2525$dbuser     = "root";
    26 //$dbpassw    = exec( "cat ~us3/.sec/.pwsq" );
    2726$dbpassw    = exec( "cat ~/.sec/.pwsq" );
    2827
Note: See TracChangeset for help on using the changeset viewer.