Merge pull request #207 from codeine-cd/codeine-205

codeine-205 ReloadConfigurationServlet need to sleep lees time on non…

Author: ezraroi

src/common/codeine/model/Constants.java

@@ -217,6 +217,7 @@ public static class UrlParameters {
 		public static final String FORCE = "force";
 		public static final String ADDRESS = "server";
 		public static final String INCLUDE_OUTPUT = "output";
+		public static final String SYNC_REQUEST = "sync";
 	}
 
 	public static String getPersistentDir() {

src/peer/codeine/servlets/ReloadConfigurationServlet.java

@@ -1,41 +1,43 @@
 package codeine.servlets;
 
+import codeine.configuration.IConfigurationManager;
+import codeine.executer.ThreadPoolUtils;
+import codeine.jsons.global.GlobalConfigurationJsonStore;
+import codeine.model.Constants.UrlParameters;
+import codeine.nodes.NodesRunner;
+import codeine.servlet.AbstractServlet;
+import com.google.inject.Inject;
 import java.io.IOException;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import codeine.executer.ThreadPoolUtils;
 import org.apache.log4j.Logger;
 
-import codeine.configuration.IConfigurationManager;
-import codeine.nodes.NodesRunner;
-
-import com.google.inject.Inject;
-import sun.nio.ch.ThreadPool;
-
-public class ReloadConfigurationServlet extends HttpServlet {
+public class ReloadConfigurationServlet extends AbstractServlet {
 	private static final Logger log = Logger.getLogger(ReloadConfigurationServlet.class);
 	private static final long serialVersionUID = 1L;
 	@Inject
 	private NodesRunner nodesRunner;
 	@Inject
 	private IConfigurationManager configurationManager;
+	@Inject
+	private GlobalConfigurationJsonStore globalConfigurationJsonStore;
 	private ExecutorService threadPool = ThreadPoolUtils.newThreadPool(1, "ReloadConfigurationServlet");
 
 	@Override
 	public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 		log.info("ReloadConfigurationServlet called");
+		String parameter = UrlParameters.SYNC_REQUEST;
+		boolean isSync = Boolean.parseBoolean(getParameter(req, parameter));
 		Runnable thread = new Runnable() {
 			@Override
 			public void run() {
 				try {
-					int millis = new Random().nextInt((int) TimeUnit.MINUTES.toMillis(1));
+					long duration = globalConfigurationJsonStore.get().large_deployment() ? 60 : 25;
+					int millis = new Random().nextInt((int) TimeUnit.SECONDS.toMillis(duration));
 					log.info("ReloadConfigurationServlet going to sleep " + millis);
 					Thread.sleep(millis);
 				} catch (InterruptedException e) {
@@ -46,7 +48,18 @@ public void run() {
 				log.info("ReloadConfigurationServlet async finished");
 			}
 		};
-		threadPool.submit(thread);
+		if (isSync) {
+			log.info("Running is sync mode");
+			thread.run();
+		}
+		else {
+			threadPool.submit(thread);
+		}
 		res.getWriter().print("{result:'OK'}");
 	}
+
+	@Override
+	protected boolean checkPermissions(HttpServletRequest request) {
+		return true;
+	}
 }