From 64c947a9f8a2b47c356f399d755fdf969f377cde Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Mon, 14 Jan 2013 10:52:37 -0800
Subject: [PATCH] Re-fix startup of management server

---
 .../cloud/servlet/CloudStartupServlet.java    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/server/src/com/cloud/servlet/CloudStartupServlet.java b/server/src/com/cloud/servlet/CloudStartupServlet.java
index eae211b63f7..d3b930d9f24 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());
+	        }
+	    }
+   }
 }