WebSVN – DevTools – Diff – /buildtool/trunk/src/generated/com/erggroup/buildtool/daemon/BuildThread.java

   /**Set true when last build cycle was benign.
    * @attribute
    */
   protected boolean mSleep;
+  /**Set true when ant error reported on any target.
+   * @attribute
+   */
+  private boolean mErrorReported;
+  /**Set true when ant error reported on AbtSetUp target.
+   * @attribute
+   */
+  private boolean mSetUpErrorReported;
   /**Logger
    * @attribute
    */
   private static final Logger mLogger = Logger.getLogger(BuildThread.class);
   BuildThread()
+  {
     super(mThreadGroup, "");
     mLogger.debug("BuildThread");
     mSleep = false;
+    mErrorReported = false;
+    mSetUpErrorReported = false;
     mReleaseManager = new ReleaseManager();
     // no need to be synchronized - BuildThreads are instantiated in a single thread
     if ( mResumeTimerTask == null )
+    {
     try
+    {
       // DEVI 46729, 46730, solaris 10 core dumps implicate deleteDirectory
       // let each BuildThread look after its own housekeeping
-      File ocwd = new File( "." );
+      File ocwd = new File( BuildDaemon.mGbeLog );
+      File hcwd = new File( ocwd, BuildDaemon.mHostname );
-      File cwd = new File( ocwd.getAbsolutePath() + System.getProperty( "file.separator" ) + mRtagId );
+      File cwd = new File( hcwd, String.valueOf( mRtagId ) );
       File[] children = cwd.listFiles( filter );
       if ( children != null )
+      {
         for ( int child=0; child < children.length; child++ )
+        {
-          // child is named uniquely after an rtag_id
+          // child is named uniquely to encapsulate a build
+          // 5 days = 432,000,000 milliseconds
-          File[] grandchildren = children[ child ].listFiles( filter );
+          if ( ( System.currentTimeMillis() - children[ child ].lastModified() ) > 432000000 )
+          {
-          if ( grandchildren != null )
+            // the directory is over 5 days old
-          {
+            mLogger.warn("housekeep deleting directory " + children[ child ].getName());
-            for ( int grandchild=0; grandchild < grandchildren.length; grandchild++ )
+            if ( mGbebuildfilter.compareTo("unit test check environment") != 0 )
+            {
-              // child is named uniquely to encapsulate a build
-              // 5 days = 432,000,000 milliseconds
-              if ( ( System.currentTimeMillis() - grandchildren[ grandchild ].lastModified() ) > 432000000 )
-              {
-                // the directory is over 5 days old
-                mLogger.warn("housekeep deleting directory " + grandchildren[ grandchild ].getName());
-                if ( mGbebuildfilter.compareTo("unit test check environment") != 0 )
-                {
-                  deleteDirectory( grandchildren[ grandchild ] );
+              deleteDirectory( children[ child ] );
-                }
-              }
+            }
+          }
+        }
+      }
+    }
   /**injects GBE_BUILDFILTER into the passed buildFileContent
    * builds a buildFile from the buildFileContent
    * triggers ant to operate on the buildFile
    */
-  protected void deliverChange(String buildFileContent, String target, boolean master) throws Exception
+  protected void deliverChange(String buildFileContent, String target, boolean master)
+  {
     mLogger.debug("deliverChange");
+    if ( ( target == null || target.compareTo( "AbtPublish" ) == 0 ) && ( mErrorReported ) )
+    {
+      // previous error occurred processing the build file content
+      return;
+    }
     File buildFile = new File(mRtagId + "build.xml");
     try
+    {
       // clear the file contents
         FileWriter buildFileWriter = new FileWriter(buildFile);
         buildFileWriter.write(sanitisedBFC);
         buildFileWriter.close();
+      }
-      String antHome = System.getenv("ANT_HOME");
-      if ( antHome == null )
-      {
-      	mLogger.fatal("deliverChange ANT_HOME not set");
-        throw new Exception();
-      }
       Project p = new Project();
       p.setProperty("ant.file", buildFile.getAbsolutePath());
       DefaultLogger dl = new DefaultLogger();
       PrintStream ps = new PrintStream(mRtagId + ".log");
       dl.setOutputPrintStream(ps);
       mLogger.warn("deliverChange ant returned");
+    }
     catch( BuildException e )
+    {
       mLogger.debug("deliverChange caught BuildException, big deal, the build failed " + e.getMessage());
+      if ( target.compareTo( "AbtSetUp ") == 0 )
+      {
+        mSetUpErrorReported = true;
+      }
+      mErrorReported = true;
+    }
     catch( FileNotFoundException e )
+    {
       mLogger.error("deliverChange caught FileNotFoundException");
+    }
+  }
   /**sets up a ClearCase static view
    */
-  protected void setViewUp(String content, boolean master) throws Exception
+  protected void setViewUp(String content, boolean master)
+  {
     mLogger.debug("setViewUp");
+    mErrorReported = false;
+    mSetUpErrorReported = false;
     // run ant on the AbtSetUp target
     deliverChange(content, "AbtSetUp", master);
+  }
   /**tears down a ClearCase static view
   */
-  protected void tearViewDown() throws Exception
+  protected void tearViewDown()
+  {
     mLogger.debug("tearViewDown");
+    if ( !mSetUpErrorReported )
+    {
+      // no error setting the view up, so...
-    // to do run ant on the AbtTearDown target
+      // run ant on the AbtTearDown target
-    deliverChange(null, "AbtTearDown", false);
+      deliverChange(null, "AbtTearDown", false);
+    }
+  }
   /**Checks the archive for the <packageName>/<packageVersion>/built.<machtype> existence
    */
   protected boolean published(String archive, String packageName,

Subversion Repositories DevTools

(root)/buildtool/trunk/src/generated/com/erggroup/buildtool/daemon/BuildThread.java @ 854 – Rev 842 → 854