Merge pull request #203 from codeine-cd/codeine-201

codeine-201 run all project modify plugin runs on a single thread and…

Author: ezraroi

src/common/codeine/jsons/global/ExperimentalConfJson.java

@@ -9,6 +9,7 @@ public class ExperimentalConfJson {
 	private String groups_plugin;
 	private String after_project_modify_plugin;
 	private String codeine_conf_modify_plugin;
+	private boolean after_project_modify_plugin_async;
 
 	public String new_issue_link() {
 		return new_issue_link;
@@ -28,5 +29,10 @@ public String after_project_modify_plugin() {
 	public String codeine_conf_modify_plugin() {
 		return codeine_conf_modify_plugin;
 	}
+	public boolean after_project_modify_plugin_async() {
+		return after_project_modify_plugin_async;
+	}
+
+
 
 }

src/web_server/codeine/plugins/AfterProjectModifyPlugin.java

@@ -1,26 +1,26 @@
 package codeine.plugins;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-
+import codeine.executer.ThreadPoolUtils;
 import codeine.jsons.global.ExperimentalConfJsonStore;
 import codeine.jsons.project.ProjectJson;
 import codeine.model.Constants;
 import codeine.model.Result;
 import codeine.utils.os_process.ProcessExecuter.ProcessExecuterBuilder;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ThreadPoolExecutor;
+import javax.inject.Inject;
+import org.apache.log4j.Logger;
 
 public class AfterProjectModifyPlugin {
 
 	@Inject private ExperimentalConfJsonStore experimentalConfJsonStore;
 
 	private static final Logger log = Logger.getLogger(AfterProjectModifyPlugin.class);
+	private ThreadPoolExecutor executor = ThreadPoolUtils
+		.newThreadPool(1, "AfterProjectModifyPlugin");
 
 	public enum StatusChange {add,remove,modify}
 
@@ -34,10 +34,42 @@ public void call(ProjectJson projectJson, StatusChange newStatus, String usernam
 			env.put(Constants.EXECUTION_ENV_PROJECT_STATUS, String.valueOf(newStatus));
 			env.put(Constants.EXECUTION_ENV_PROJECT_NAME, projectJson.name());
 			env.put(Constants.EXECUTION_ENV_USER_NAME, username);
-			log.info("executing " + after_project_modify_plugin);
-			Result result = new ProcessExecuterBuilder(cmd).timeoutInMinutes(2).env(env).build().execute();
-			log.info("calling after_project_modify_plugin for project " + projectJson.name() + " finished " + result.toStringLong());
+			if (experimentalConfJsonStore.get().after_project_modify_plugin_async()) {
+				log.info("Queuing after_project_modify_plugin run");
+				executor.execute(
+					new PluginRunnable(after_project_modify_plugin, cmd, env, projectJson));
+			}
+			else {
+				log.info("executing " + after_project_modify_plugin);
+				Result result = new ProcessExecuterBuilder(cmd).timeoutInMinutes(2).env(env).build().execute();
+				log.info("calling after_project_modify_plugin for project " + projectJson.name() + " finished " + result.toStringLong());
+			}
+
+
 		}
 	}
 
+	private static class PluginRunnable implements Runnable {
+
+		private final String after_project_modify_plugin;
+		private final List<String> cmd;
+		private final Map<String, String> env;
+		private final ProjectJson projectJson;
+
+		PluginRunnable(String after_project_modify_plugin, List<String> cmd,
+			Map<String, String> env,
+			ProjectJson projectJson) {
+			this.after_project_modify_plugin = after_project_modify_plugin;
+			this.cmd = cmd;
+			this.env = env;
+			this.projectJson = projectJson;
+		}
+
+		@Override
+        public void run() {
+            log.info("executing " + after_project_modify_plugin);
+            Result result = new ProcessExecuterBuilder(cmd).timeoutInMinutes(2).env(env).build().execute();
+            log.info("calling after_project_modify_plugin for project " + projectJson.name() + " finished " + result.toStringLong());
+        }
+	}
 }