CLOUDSTACK-2033 Fix usage server startup and logging

spark404 · spark404 · commit 574e71635229 · 2013-04-16T10:52:49.000+02:00
Properly implement the Daemon interface

Initialize logging when the usage server is started as a daemon

Fix a few minor startup and packaging items.
diff --git a/build/replace.properties b/build/replace.properties
@@ -27,3 +27,4 @@ MSMNTDIR=/mnt
 COMPONENTS-SPEC=components.xml
 AWSAPILOG=awsapi.log
 REMOTEHOST=localhost
+COMMONLIBDIR=C:\Users\htrippaers\eclipse_workspace\cloudstack\client\target\cloud-client-ui-4.2.0-SNAPSHOT\WEB-INF\classes
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
@@ -58,7 +58,7 @@ export JAVA_HOME
 
 SCP=""
 DCP=""
-UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/* | tr '\n' ':'`
+UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/*.jar | tr '\n' ':'`
 JCP="/usr/share/java/commons-daemon.jar"
 
 # We need to append the JSVC daemon JAR to the classpath
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
@@ -447,13 +447,6 @@ if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
     ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
 fi
 
-if [ -f "%{_sysconfdir}/%{name}/management/log4j-cloud.xml" ]; then
-    echo Replacing log4j-cloud.xml with management server log4j-cloud.xml
-    rm -f %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
-    ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
-fi
-
-
 #%post awsapi
 #if [ -d "%{_datadir}/%{name}-management" ] ; then
 #   ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
@@ -548,7 +541,7 @@ fi
 %attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-usage
 %attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
 %attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
-%dir /var/log/%{name}/usage
+%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage
 %attr(0644,root,root) %{_sysconfdir}/%{name}/usage/db.properties
 %attr(0644,root,root) %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
 %{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties
@@ -56,5 +56,5 @@ SYSCONFDIR=/etc/sysconfig
 SYSTEMCLASSPATH=
 SYSTEMJARS=
 USAGECLASSPATH=
-USAGELOG=/var/log/cloudstack/usage
+USAGELOG=/var/log/cloudstack/usage/usage.log
 USAGESYSCONFDIR=/etc/sysconfig
diff --git a/usage/pom.xml b/usage/pom.xml
@@ -37,6 +37,11 @@
       <version>${cs.mysql.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+    	<groupId>commons-daemon</groupId>
+    	<artifactId>commons-daemon</artifactId>
+    	<version>1.0.10</version>
+    </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java
@@ -19,6 +19,9 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonInitException;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.xml.DOMConfigurator;
@@ -29,7 +32,7 @@
 import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.component.ComponentContext;
 
-public class UsageServer {
+public class UsageServer implements Daemon {
     private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName());
     public static final String Name = "usage-server";
     
@@ -39,15 +42,17 @@ public class UsageServer {
      * @param args
      */
     public static void main(String[] args) {
-    	initLog4j();
+        initLog4j();
         UsageServer usage = new UsageServer();
-        usage.init(args);
         usage.start();
     }
 
-    public void init(String[] args) {
+    @Override
+    public void init(DaemonContext arg0) throws DaemonInitException, Exception {
+        initLog4j();        
     }
 
+    @Override
     public void start() {
     	ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
 	    
@@ -66,10 +71,12 @@ public void start() {
         }
     }
 
+    @Override
     public void stop() {
 
     }
 
+    @Override
     public void destroy() {
 
     }
@@ -96,4 +103,5 @@ static private void initLog4j() {
 	        }
 	    }
    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`import java.io.File;`
`20`	`20`	`import java.io.FileNotFoundException;`
`21`	`21`
	`22`	`+import org.apache.commons.daemon.Daemon;`
	`23`	`+import org.apache.commons.daemon.DaemonContext;`
	`24`	`+import org.apache.commons.daemon.DaemonInitException;`
`22`	`25`	`import org.apache.log4j.Logger;`
`23`	`26`	`import org.apache.log4j.PropertyConfigurator;`
`24`	`27`	`import org.apache.log4j.xml.DOMConfigurator;`
`@@ -29,7 +32,7 @@`
`29`	`32`	`import com.cloud.utils.PropertiesUtil;`
`30`	`33`	`import com.cloud.utils.component.ComponentContext;`
`31`	`34`
`32`		`-public class UsageServer {`
	`35`	`+public class UsageServer implements Daemon {`
`33`	`36`	`private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName());`
`34`	`37`	`public static final String Name = "usage-server";`
`35`	`38`
`@@ -39,15 +42,17 @@ public class UsageServer {`
`39`	`42`	`* @param args`
`40`	`43`	`*/`
`41`	`44`	`public static void main(String[] args) {`
`42`		`- initLog4j();`
	`45`	`+ initLog4j();`
`43`	`46`	`UsageServer usage = new UsageServer();`
`44`		`- usage.init(args);`
`45`	`47`	`usage.start();`
`46`	`48`	`}`
`47`	`49`
`48`		`- public void init(String[] args) {`
	`50`	`+ @Override`
	`51`	`+ public void init(DaemonContext arg0) throws DaemonInitException, Exception {`
	`52`	`+ initLog4j();`
`49`	`53`	`}`
`50`	`54`
	`55`	`+ @Override`
`51`	`56`	`public void start() {`
`52`	`57`	`ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");`
`53`	`58`
`@@ -66,10 +71,12 @@ public void start() {`
`66`	`71`	`}`
`67`	`72`	`}`
`68`	`73`
	`74`	`+ @Override`
`69`	`75`	`public void stop() {`
`70`	`76`
`71`	`77`	`}`
`72`	`78`
	`79`	`+ @Override`
`73`	`80`	`public void destroy() {`
`74`	`81`
`75`	`82`	`}`
`@@ -96,4 +103,5 @@ static private void initLog4j() {`
`96`	`103`	`}`
`97`	`104`	`}`
`98`	`105`	`}`
	`106`	`+`
`99`	`107`	`}`