[webapp] make webapp & scouter pulse working together

Author: gunlee01

scouter.server/src/main/java/scouter/server/http/HttpServer.java

@@ -70,20 +70,14 @@ public void run() {
             RequestLogHandler requestLogHandler = new RequestLogHandler();
             requestLogHandler.setRequestLog(requestLog);
 
-            ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-            context.setContextPath("/");
-            context.addServlet(new ServletHolder(CounterServlet.class), "/counter/*");
-            context.addServlet(new ServletHolder(RegisterServlet.class), "/register/*");
-
+            ServletContextHandler context = null;
             handlers.addHandler(requestLogHandler);
-            handlers.addHandler(context);
-
-            server.setHandler(handlers);
 
             if (conf.net_http_api_enabled) {
                 try {
                     Class c = Class.forName("scouterx.webapp.main.WebAppMain");
-                    c.getMethod("setWebAppContext", Server.class).invoke(null, server);
+                    Object result = c.getMethod("setWebAppContext").invoke(null);
+                    context = (ServletContextHandler) result;
                 } catch (Throwable e) {
                     Logger.println("Error while loading webapp api context!");
                     System.out.println("Error while loading webapp api context!");
@@ -92,6 +86,16 @@ public void run() {
                 }
             }
 
+            if (context == null) {
+                context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+                context.setContextPath("/");
+            }
+            context.addServlet(new ServletHolder(CounterServlet.class), "/counter/*");
+            context.addServlet(new ServletHolder(RegisterServlet.class), "/register/*");
+
+            handlers.addHandler(context);
+            server.setHandler(handlers);
+
             try {
                 server.start();
                 server.join();

scouter.webapp/src/main/java/scouterx/webapp/layer/controller/CounterController.java

@@ -54,7 +54,7 @@ public CounterController() {
 
     /**
      * get current value of several counters about a type
-     * uri : /counter/realTime/{counters}/ofType/{objType}?serverId=1001010&counters=GcCount,GcTime or ?counters=[GcCount,GcTime]
+     * uri : /counter/realTime/{counters}/ofType/{objType}?serverId=1001010
      *
      * @param objType
      * @param counterNameByCommaSeparator

scouter.webapp/src/main/java/scouterx/webapp/main/WebAppMain.java

@@ -63,15 +63,23 @@ public static boolean isStandAloneMode() {
     }
 
 	public static void main(String[] args) {
-        WebAppMain.standAloneMode = true;
+        standAloneMode = true;
 		Logo.print(true);
         initializeLogDir();
 
         ConfigureAdaptor conf = ConfigureManager.getConfigure();
         connectScouterCollector();
 
         Server server = new Server(conf.getNetHttpPort());
-		setWebAppContext(server);
+		HandlerCollection handlers = new HandlerCollection();
+
+		RequestLogHandler requestLogHandler = setRequestLogHandler();
+		handlers.addHandler(requestLogHandler);
+
+		ServletContextHandler context = setWebAppContext();
+		handlers.addHandler(context);
+
+		server.setHandler(handlers);
 
 		try {
 			server.start();
@@ -81,6 +89,23 @@ public static void main(String[] args) {
 		}
 	}
 
+	private static RequestLogHandler setRequestLogHandler() {
+		ConfigureAdaptor conf = ConfigureManager.getConfigure();
+
+		NCSARequestLog requestLog = new NCSARequestLog();
+		requestLog.setFilename("./logs/http-request-yyyy_mm_dd.log");
+		requestLog.setFilenameDateFormat("yyyy_MM_dd");
+		requestLog.setRetainDays(conf.getLogKeepDays());
+		requestLog.setAppend(true);
+		requestLog.setExtended(true);
+		requestLog.setLogCookies(false);
+		requestLog.setLogTimeZone(TimeZone.getDefault().getID());
+		RequestLogHandler requestLogHandler = new RequestLogHandler();
+		requestLogHandler.setRequestLog(requestLog);
+
+		return requestLogHandler;
+	}
+
     private static void connectScouterCollector() {
         Logger log = LoggerFactory.getLogger(WebAppMain.class);
 
@@ -149,37 +174,20 @@ private static void initializeLogDir() {
         firstLogger.info("scouter webapp starting! Run-Mode:" + (WebAppMain.standAloneMode ? "StandAlone" : "Embedded"));
     }
 
-    public static void setWebAppContext(Server server) {
+    public static ServletContextHandler setWebAppContext() {
         ConfigureAdaptor conf = ConfigureManager.getConfigure();
 
         //The case - embedded mode (run in-process of scouter server)
-        if (WebAppMain.standAloneMode == false) {
+        if (!standAloneMode) {
             initializeLogDir();
             connectScouterCollector();
         }
 
-		HandlerCollection handlers = new HandlerCollection();
-		NCSARequestLog requestLog = new NCSARequestLog();
-		requestLog.setFilename("./logs/http-request-yyyy_mm_dd.log");
-		requestLog.setFilenameDateFormat("yyyy_MM_dd");
-		requestLog.setRetainDays(conf.getLogKeepDays());
-		requestLog.setAppend(true);
-		requestLog.setExtended(true);
-		requestLog.setLogCookies(false);
-		requestLog.setLogTimeZone(TimeZone.getDefault().getID());
-		RequestLogHandler requestLogHandler = new RequestLogHandler();
-		requestLogHandler.setRequestLog(requestLog);
-
 		ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.getSessionHandler().setMaxInactiveInterval(conf.getNetHttpApiSessionTimeout());
 
         context.setBaseResource(Resource.newClassPathResource("/webroot"));
-
 		context.setContextPath("/");
-		handlers.addHandler(requestLogHandler);
-		handlers.addHandler(context);
-
-		server.setHandler(handlers);
 
 		ServletHolder jerseyHolder = new ServletHolder(ServletContainer.class);
 		jerseyHolder.setInitParameter("jersey.config.server.provider.packages", "scouterx.webapp");
@@ -191,5 +199,7 @@ public static void setWebAppContext(Server server) {
 		ServletHolder defaultHolder = new ServletHolder("default", DefaultServlet.class);
 		defaultHolder.setInitParameter("dirAllowed","false");
 		context.addServlet(defaultHolder,"/");
+
+		return context;
 	}
 }