Updated Branches: refs/heads/4.1 2e395b850 -> 80c588e6b
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/80c588e6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80c588e6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80c588e6 Branch: refs/heads/4.1 Commit: 80c588e6b6d04fa97d4934d12ae191aafde67319 Parents: 2e395b8 Author: Kelven Yang <[email protected]> Authored: Fri Mar 29 13:44:12 2013 -0700 Committer: Chip Childers <[email protected]> Committed: Sat Mar 30 20:19:09 2013 +0000 ---------------------------------------------------------------------- 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/80c588e6/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()); } }
