[jboss-cvs] JBossAS SVN: r61208 - projects/test/trunk/test/src/main/org/jboss/test/util/server.

[jboss-cvs-commits at lists.jboss.org]

Author: akostadinov
Date: 2007-03-07 17:16:29 -0500 (Wed, 07 Mar 2007)
New Revision: 61208

Modified:
   projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerController.java
   projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerManager.java
Log:
JBAS-4120 startup timeout system property and destroy process after startup timeout

Modified: projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerController.java
===================================================================
--- projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerController.java	2007-03-07 21:54:50 UTC (rev 61207)
+++ projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerController.java	2007-03-07 22:16:29 UTC (rev 61208)
@@ -187,6 +187,12 @@
             return;
          }
       }
+
+      Process process = server.getProcess();
+      System.err.println("Failed to start server \"" + server.getName()
+            + "\" before timeout. Destroying the process.");
+      process.destroy();
+
       throw new IOException("Server failed to start; see logs.");
 
    }

Modified: projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerManager.java
===================================================================
--- projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerManager.java	2007-03-07 21:54:50 UTC (rev 61207)
+++ projects/test/trunk/test/src/main/org/jboss/test/util/server/ServerManager.java	2007-03-07 22:16:29 UTC (rev 61208)
@@ -39,8 +39,9 @@
    /**
     * Wait for 45 secs
     */
-   private static final int WAIT_TIME = 45;
-   private static final int START_TIME = 120;
+   // set jbossas.startup.timeout property in env.ANT_OPTS
+   private static final int WAIT_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "45"));
+   private static final int START_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "120"));
    
    /** jboss root **/
    private String jbossHome;
@@ -258,4 +259,4 @@
       this.udpGroup = udpGroup;
    }
    
-}
\ No newline at end of file
+}