Updated Branches: refs/heads/4.1 4f071bcdf -> d813a7ba9
CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d813a7ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d813a7ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d813a7ba Branch: refs/heads/4.1 Commit: d813a7ba98682c03342044c4ddde08bf23470a86 Parents: 4f071bc Author: Kelven Yang <[email protected]> Authored: Mon Mar 11 19:06:12 2013 -0700 Committer: Chip Childers <[email protected]> Committed: Tue Mar 12 09:36:08 2013 -0400 ---------------------------------------------------------------------- agent/src/com/cloud/agent/AgentShell.java | 15 +++++++++++++++ utils/src/com/cloud/utils/LogUtils.java | 3 +-- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d813a7ba/agent/src/com/cloud/agent/AgentShell.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index e736978..18879db 100644 --- a/agent/src/com/cloud/agent/AgentShell.java +++ b/agent/src/com/cloud/agent/AgentShell.java @@ -38,10 +38,13 @@ import java.util.UUID; import javax.naming.ConfigurationException; +import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.log4j.Logger; +import org.apache.log4j.PropertyConfigurator; +import org.apache.log4j.xml.DOMConfigurator; import com.cloud.agent.Agent.ExitStatus; import com.cloud.agent.dao.StorageComponent; @@ -377,6 +380,18 @@ public class AgentShell implements IAgentShell { public void init(String[] args) throws ConfigurationException { + // PropertiesUtil is used both in management server and agent packages, + // it searches path under class path and common J2EE containers + // For KVM agent, do it specially here + + File file = new File("/etc/cloudstack/agent/log4j-cloud.xml"); + if(file == null || !file.exists()) { + file = PropertiesUtil.findConfigFile("log4j-cloud.xml"); + } + DOMConfigurator.configureAndWatch(file.getAbsolutePath()); + + s_logger.info("Agent started"); + final Class<?> c = this.getClass(); _version = c.getPackage().getImplementationVersion(); if (_version == null) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d813a7ba/utils/src/com/cloud/utils/LogUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/LogUtils.java b/utils/src/com/cloud/utils/LogUtils.java index 975de83..19c4c0e 100644 --- a/utils/src/com/cloud/utils/LogUtils.java +++ b/utils/src/com/cloud/utils/LogUtils.java @@ -19,7 +19,6 @@ package com.cloud.utils; import java.io.File; import org.apache.log4j.Logger; -import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.xml.DOMConfigurator; public class LogUtils { @@ -36,7 +35,7 @@ public class LogUtils { file = PropertiesUtil.findConfigFile(nameWithoutExtension + ".properties"); if (file != null) { s_logger.info("log4j configuration found at " + file.getAbsolutePath()); - PropertyConfigurator.configureAndWatch(file.getAbsolutePath()); + DOMConfigurator.configureAndWatch(file.getAbsolutePath()); } } }
