From f8471e545f41dd3c57fd65f9be9c2b3f25dba4ab Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 29 Mar 2013 13:44:12 -0700 Subject: [PATCH] CLOUDSTACK-1746: fix logging warning in usage server --- usage/src/com/cloud/usage/UsageServer.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java index 881962f5c79..3f2b43e2bc9 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()); } }