cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [49/52] [abbrv] git commit: updated refs/heads/qemu-img to 44197a0
Date Sat, 30 Mar 2013 09:59:18 GMT
CLOUDSTACK-1746: fix logging warning in usage server


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8471e54
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8471e54
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8471e54

Branch: refs/heads/qemu-img
Commit: f8471e545f41dd3c57fd65f9be9c2b3f25dba4ab
Parents: 5782abf
Author: Kelven Yang <kelveny@gmail.com>
Authored: Fri Mar 29 13:44:12 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Fri Mar 29 13:44:12 2013 -0700

----------------------------------------------------------------------
 usage/src/com/cloud/usage/UsageServer.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8471e54/usage/src/com/cloud/usage/UsageServer.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java
index 881962f..3f2b43e 100644
--- a/usage/src/com/cloud/usage/UsageServer.java
+++ b/usage/src/com/cloud/usage/UsageServer.java
@@ -17,12 +17,14 @@
 package com.cloud.usage;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.xml.DOMConfigurator;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.util.Log4jConfigurer;
 
 import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.component.ComponentContext;
@@ -75,12 +77,21 @@ public class UsageServer {
     static 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());
+	        System.out.println("log4j configuration found at " + file.getAbsolutePath());
+	        try {
+				Log4jConfigurer.initLogging(file.getAbsolutePath());
+			} catch (FileNotFoundException e) {
+			}
+	        DOMConfigurator.configureAndWatch(file.getAbsolutePath());
+	        
 	    } else {
 	        file = PropertiesUtil.findConfigFile("log4j-cloud.properties");
 	        if (file != null) {
-	            s_logger.info("log4j configuration found at " + file.getAbsolutePath());
+		        System.out.println("log4j configuration found at " + file.getAbsolutePath());
+		        try {
+					Log4jConfigurer.initLogging(file.getAbsolutePath());
+				} catch (FileNotFoundException e) {
+				}
 	            PropertyConfigurator.configureAndWatch(file.getAbsolutePath());
 	        }
 	    }


Mime
View raw message