Updated Branches: refs/heads/javelin 61ff07e35 -> 64c947a9f
Re-fix startup of management server Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/64c947a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/64c947a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/64c947a9 Branch: refs/heads/javelin Commit: 64c947a9f8a2b47c356f399d755fdf969f377cde Parents: 61ff07e Author: Kelven Yang <[email protected]> Authored: Mon Jan 14 10:52:37 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Mon Jan 14 10:52:37 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/servlet/CloudStartupServlet.java | 21 +++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/64c947a9/server/src/com/cloud/servlet/CloudStartupServlet.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/servlet/CloudStartupServlet.java b/server/src/com/cloud/servlet/CloudStartupServlet.java index eae211b..d3b930d 100755 --- a/server/src/com/cloud/servlet/CloudStartupServlet.java +++ b/server/src/com/cloud/servlet/CloudStartupServlet.java @@ -16,17 +16,22 @@ // under the License. package com.cloud.servlet; +import java.io.File; + import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import org.apache.log4j.Logger; +import org.apache.log4j.PropertyConfigurator; +import org.apache.log4j.xml.DOMConfigurator; import com.cloud.api.ApiServer; import com.cloud.exception.InvalidParameterValueException; import com.cloud.server.ConfigurationServer; import com.cloud.server.ManagementServer; +import com.cloud.utils.PropertiesUtil; import com.cloud.utils.SerialVersionUID; import com.cloud.utils.component.ComponentContext; @@ -37,10 +42,12 @@ public class CloudStartupServlet extends HttpServlet implements ServletContextLi @Override public void init() throws ServletException { + initLog4j(); ConfigurationServer c = (ConfigurationServer)ComponentContext.getComponent(ConfigurationServer.Name); try { c.persistDefaultValues(); ManagementServer ms = (ManagementServer)ComponentContext.getComponent(ManagementServer.Name); + ms.startup(); ms.enableAdminUser("password"); ApiServer.initApiServer(); } catch (InvalidParameterValueException ipve) { @@ -65,4 +72,18 @@ public class CloudStartupServlet extends HttpServlet implements ServletContextLi @Override public void contextDestroyed(ServletContextEvent sce) { } + + private void initLog4j() { + File file = PropertiesUtil.findConfigFile("log4j-cloud.xml"); + if (file != null) { + s_logger.info("log4j configuration found at " + file.getAbsolutePath()); + DOMConfigurator.configureAndWatch(file.getAbsolutePath()); + } else { + file = PropertiesUtil.findConfigFile("log4j-cloud.properties"); + if (file != null) { + s_logger.info("log4j configuration found at " + file.getAbsolutePath()); + PropertyConfigurator.configureAndWatch(file.getAbsolutePath()); + } + } + } }
