From 0452d2128dc8b9907067f81ec6c29f517e7a7a43 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 20 Jul 2010 01:01:46 +0800 Subject: [PATCH] * change root logger name to the shorter form of "webui". * initialized CLogMgt for the webui root logger if the platform have been started by other server side services. --- .../webui/session/SessionContextListener.java | 2 +- .../adempiere/webui/session/WebUIServlet.java | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java b/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java index c0e32711a0..180503f8f5 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java @@ -81,7 +81,7 @@ public class SessionContextListener implements ExecutionInit, SessionManager.getAppDesktop().showURL(url, true); } }); - ctx.put(CLogMgt.ROOT_LOGGER_NAME_PROPERTY, "org.adempiere.webui"); + ctx.put(CLogMgt.ROOT_LOGGER_NAME_PROPERTY, WebUIServlet.WEBUI_ROOT_LOGGER_NAME); ctx.setProperty(SERVLET_SESSION_ID, httpSession.getId()); session.setAttribute(SESSION_CTX, ctx); } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java index 7859e83709..27df4ae81c 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java @@ -49,16 +49,13 @@ import org.adempiere.util.ServerContextURLHandler; */ public class WebUIServlet extends DHtmlLayoutServlet { - private static final long serialVersionUID = 1L; + public static final String WEBUI_ROOT_LOGGER_NAME = "webui"; + + private static final long serialVersionUID = 1L; /** Logger for the class * */ private static CLogger logger; - static - { - logger = CLogger.getCLogger(WebUIServlet.class); - } - public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); @@ -70,20 +67,30 @@ public class WebUIServlet extends DHtmlLayoutServlet SessionManager.getAppDesktop().showURL(url, true); } }); - serverContext.put(CLogMgt.ROOT_LOGGER_NAME_PROPERTY, "org.adempiere.webui"); + serverContext.put(CLogMgt.ROOT_LOGGER_NAME_PROPERTY, WEBUI_ROOT_LOGGER_NAME); ServerContext.setCurrentInstance(serverContext); - boolean started = Adempiere.startup(false); - if(!started) + if (!Adempiere.isStarted()) { - throw new ServletException("Could not start ADempiere"); + boolean started = Adempiere.startup(false); + if(!started) + { + throw new ServletException("Could not start ADempiere"); + } } + else + { + CLogMgt.initialize(false); + CLogMgt.setLevel(Ini.getProperty(Ini.P_TRACELEVEL)); + } + + logger = CLogger.getCLogger(WebUIServlet.class); // hengsin: temporary solution for problem with zk client Ini.setProperty(Ini.P_ADEMPIERESYS, false); ReportCtl.setReportViewerProvider(new ZkReportViewerProvider()); ReportStarter.setReportViewerProvider(new ZkJRViewerProvider()); - logger.log(Level.OFF, "ADempiere started successfully"); + logger.log(Level.OFF, "ADempiere web ui service started successfully"); /** * End ADempiere Start */