- Timestamp:
- Feb 7, 2017, 5:53:08 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cleanup.php
r26 r27 194 194 $fn_stdout = "Ultrascan.stdout"; 195 195 $fn_tarfile = "analysis-results.tar"; 196 $secwait = 10; 196 197 $num_try = 0; 197 198 write_log( "$me: fn_tarfile=$fn_tarfile" ); 198 199 while ( ! file_exists( $fn_tarfile ) && $num_try < 3 ) 199 200 { 200 sleep( 10);201 sleep( $secwait ); 201 202 $num_try++; 203 $secwait *= 2; 202 204 write_log( "$me: tar-exists: num_try=$num_try" ); 203 205 } … … 206 208 foreach ( $ofiles as $ofile ) 207 209 { 208 if ( preg_match( "/^ " . $gfacID . ".*stderr$/", $ofile ) )210 if ( preg_match( "/^.*stderr$/", $ofile ) ) 209 211 $fn_stderr = $ofile; 210 if ( preg_match( "/^ " . $gfacID . ".*stdout$/", $ofile ) )212 if ( preg_match( "/^.*stdout$/", $ofile ) ) 211 213 $fn_stdout = $ofile; 212 214 //write_log( "$me: ofile=$ofile" ); … … 925 927 if ( file_exists( "stderr" ) ) 926 928 { // Filter stderr to not have libnnls debug lines 927 exec( "mv stderr stderr+nnls", $output, $stat );928 exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );929 // exec( "mv stderr stderr+nnls", $output, $stat ); 930 // exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat ); 929 931 $stderr = file_get_contents( "stderr" ); 930 932 } … … 940 942 941 943 $lense = strlen( $stderr ); 942 if ( $lense > 1000000 )944 if ( $lense > 10000000 ) 943 945 { // Replace exceptionally large stderr with smaller version 944 946 exec( "mv stderr stderr-orig", $output, $stat ); -
trunk/gridctl.php
r26 r27 852 852 853 853 case "C" : // Job has completed 854 case "" : 854 855 $status = 'COMPLETED'; 855 856 break;
Note:
See TracChangeset
for help on using the changeset viewer.