Subversion Repositories DevTools

Rev

Rev 926 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 926 Rev 1351
Line 294... Line 294...
294 
      {
 294 
      {
295 
        Log( "copyFile caught Exception", error );
 295 
        Log( "copyFile caught Exception", error );
296 
      }
 296 
      }
297 
    }
 297 
    }
298 
  }
 298 
  }
299
- 
 
300 
  private void reportError(String error, int retVal)
 - 
 
301 
  {
 - 
 
302 
    propertyValue = String.valueOf( retVal );
 - 
 
303 
 
 - 
 
304 
    Log( error, ABT.error );
 - 
 
305 
    Log( "reportError propertyValue = " + propertyValue.toString() + ", ", error);
 - 
 
306 
 
 299 
 
- 
 
 300 
  //
- 
 
 301 
  //  Save the log file
- 
 
 302 
  //    used on error build
- 
 
 303 
  //    used on complete build
- 
 
 304 
  //
- 
 
 305 
  private boolean saveLogs()
- 
 
 306 
  {
307 
    if ( daemon == null )
 307 
    if ( daemon == null )
308 
    {
 308 
    {
309 
      // do nothing more in escrow
 309 
      // do nothing more in escrow
310 
      return;
 310 
      return false;
311 
    }
 311 
    }
312
312 
 
313 
    // persist the failure log to GBE_LOG/hostname/rtagid/timestamp
 313 
    // persist the failure log to GBE_LOG/hostname/rtagid/timestamp
314 
    String log = System.getenv("GBE_LOG");
 314 
    String log = System.getenv("GBE_LOG");
315
315
316 
    if ( log == null )
 316 
    if ( log == null )
317 
    {
 317 
    {
318 
      // cannot happen, GBE_LOG is checked in BuildDaemon at startup
 318 
      // cannot happen, GBE_LOG is checked in BuildDaemon at startup
319 
      return;
 319 
      return false;
320 
    }
 320 
    }
321
321
322 
    try
 322 
    try
323 
    {
 323 
    {
324 
      InetAddress local = InetAddress.getLocalHost();
 324 
      InetAddress local = InetAddress.getLocalHost();
Line 345... Line 345...
345 
      copyFile( buildsource, buildcopy );
 345 
      copyFile( buildsource, buildcopy );
346 
      File logcopy = new File( destinationTimestamp, packageAlias + ".log");
 346 
      File logcopy = new File( destinationTimestamp, packageAlias + ".log");
347 
      copyFile( logsource, logcopy );
 347 
      copyFile( logsource, logcopy );
348 
      Log("reportError persisting " + logcopy.getName(), warn);
 348 
      Log("reportError persisting " + logcopy.getName(), warn);
349 
    }
 349 
    }
- 
 
 350 
 
- 
 
 351 
    return true;
- 
 
 352 
  }
- 
 
 353 
 
- 
 
 354 
  private void reportError(String error, int retVal)
- 
 
 355 
  {
- 
 
 356 
    propertyValue = String.valueOf( retVal );
- 
 
 357 
 
- 
 
 358 
    Log( error, ABT.error );
- 
 
 359 
    Log( "reportError propertyValue = " + propertyValue.toString() + ", ", error);
- 
 
 360 
 
- 
 
 361 
    //  Save the logs
- 
 
 362 
    //      Will return false in situations were we can't proceed
- 
 
 363 
    if ( ! saveLogs() )
- 
 
 364 
    {
- 
 
 365 
        return;
- 
 
 366 
    }
350
367
351 
    if ( !ownerCollection.isEmpty() )
 368 
    if ( !ownerCollection.isEmpty() )
352 
    {
 369 
    {
353 
      String unc = System.getenv("GBE_UNC");
 370 
      String unc = System.getenv("GBE_UNC");
354
371
Line 1142... Line 1159...
1142 
          runCommand( "Failure to remove source code extraction" );
 1159 
          runCommand( "Failure to remove source code extraction" );
1143 
        }
 1160 
        }
1144 
 
 1161 
 
1145 
        // delete the rtag directory
 1162 
        // delete the rtag directory
1146 
        deleteDirectory( new File( rtagId ) );
 1163 
        deleteDirectory( new File( rtagId ) );
- 
 
 1164 
 
- 
 
 1165 
        // Always save the log files
1147
1166 
        saveLogs();
- 
 
 1167 
 
1148 
        return;
1168 
        return;
1149 
      }
 1169 
      }
1150
1170
1151 
      directChange = project.getProperty(packageAlias + "directchange");
 1171 
      directChange = project.getProperty(packageAlias + "directchange");
1152
1172