process timeout is now configurable via Variable settings in Bamboo UI

Author: janatzend

README.md

@@ -100,3 +100,12 @@ The Zend Server Statistics Graph gives you event related data from Zend Server t
 [Package Structure]:http://files.zend.com/help/Zend-Server/zend-server.htm#understanding_the_package_structure.htm
 [Configuring Tasks]:https://confluence.atlassian.com/display/BAMBOO/Configuring+tasks
 [Shared Artifacts]:https://confluence.atlassian.com/display/BAMBOO/Bamboo+Best+Practice+-+Sharing+artifacts
+
+Troubleshooting
+---------------
+## Process Timeout
+If you run into a timeout problem that the process of creating the ZPK or for deploying the app to the server takes more than 60 seconds (default value), you can specify a processTimeout variable in the Build section or in the Deploy section.
+For the Build section you can find a 'Variable' tab in the plan configuration.
+For the Deploy section you can find a button "Variables" in the environment seettings.
+The variable name has to be `processTimeout`, the value has to be an **integer** (unit is **seconds**) according to your needs.
+That means that you are able to set the timeout per Plan resp. Deploy but not on a Task level.

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.zend.zendserver.bamboo.plugin</groupId>
     <artifactId>zendserver</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <organization>
         <name>Zend Technologies</name>
         <url>http://www.zend.com/</url>
@@ -60,6 +60,7 @@
                 <configuration>
                     <productVersion>${bamboo.version}</productVersion>
                     <productDataVersion>${bamboo.data.version}</productDataVersion>
+                     <enableFastdev>true</enableFastdev>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/com/zend/zendserver/bamboo/Env/Build.java

@@ -11,6 +11,7 @@
 import com.atlassian.bamboo.plan.artifact.ArtifactSubscriptionContext;
 import com.atlassian.bamboo.task.TaskContext;
 import com.atlassian.bamboo.task.TaskDefinition;
+import com.atlassian.bamboo.variable.VariableDefinitionContext;
 
 public class Build implements BuildEnv {
 	public static final String DEFAULT_ZPK_DIR = "/zpk";
@@ -187,4 +188,18 @@ private String getZpkAbsolutePath(File zpk) throws Exception{
 		logger.addBuildLogEntry("File found: " + zpk.getAbsolutePath());
 		return zpk.getAbsolutePath();
 	}
+	
+	public long getProcessTimeout() {
+		long processTimeout;
+		try {
+			VariableDefinitionContext processTimeoutContext = taskContext.getBuildContext().getVariableContext().getDefinitions().get("processTimeout");
+			processTimeout = Long.parseLong(processTimeoutContext.getValue()) * 1000;
+		}
+		catch (Exception e) {
+			processTimeout = 60 * 1000;
+		}
+		return processTimeout;
+		
+		
+	}
 }

src/main/java/com/zend/zendserver/bamboo/Env/BuildEnv.java

@@ -7,5 +7,6 @@ public interface BuildEnv {
 	public String getZpkDir() throws Exception;
 	public String getZpkPath() throws Exception;
 	public String getZpkFileName() throws Exception;
+	public long getProcessTimeout();
 }
 

src/main/java/com/zend/zendserver/bamboo/Env/Deploy.java

@@ -8,6 +8,7 @@
 import com.atlassian.bamboo.build.logger.BuildLogger;
 import com.atlassian.bamboo.task.CommonTaskContext;
 import com.atlassian.bamboo.task.TaskDefinition;
+import com.atlassian.bamboo.variable.VariableDefinitionContext;
 
 public class Deploy implements BuildEnv {
 	public static final String ARTIFACT_DOWNLOADER_KEY = "com.atlassian.bamboo.plugins.bamboo-artifact-downloader-plugin:artifactdownloadertask";
@@ -118,4 +119,16 @@ private String getZpkAbsolutePath(File zpk) throws Exception{
 		zpkPath = zpk.getAbsolutePath();
 		return zpk.getAbsolutePath();
 	}
+	
+	public long getProcessTimeout() {
+		long processTimeout;
+		try {
+			VariableDefinitionContext processTimeoutContext = taskContext.getCommonContext().getVariableContext().getDefinitions().get("processTimeout");
+			processTimeout = Long.parseLong(processTimeoutContext.getValue()) * 1000;
+		}
+		catch (Exception e) {
+			processTimeout = 60 * 1000;
+		}
+		return processTimeout;
+	}
 }

src/main/java/com/zend/zendserver/bamboo/Process/ProcessHandler.java

@@ -24,6 +24,8 @@ public ProcessHandler(Process process, BuildLogger buildLogger)
 		this.buildLogger = buildLogger;
 
 		this.processHandler = new PluggableProcessHandler();
+		
+		
     }
 
 	public ExternalProcess getExternalProcess() {
@@ -37,6 +39,11 @@ protected ExternalProcessBuilder getProcessBuilder() throws Exception {
 			.env("HOMEPATH", "\\")
 			.env("HOMEDRIVE", "c:")
 			.handler(processHandler);
+		
+		long processTimeout = buildEnv.getProcessTimeout();
+		buildLogger.addBuildLogEntry("Set Process Timeout to " + processTimeout / 1000 + " sec");
+		epb.executionTimeout(processTimeout);
+		epb.idleTimeout(processTimeout);
 		return epb;
 	}
 

target/zendserver-1.2.2.jar

@@ -1 +1 @@
-zendserver-1.2.1.jar
+zendserver-1.2.2.jar