From 62fb595fc62eb935f582aecab5fb94dfe9bb5169 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 21 Jun 2008 12:10:08 +0000 Subject: [PATCH] Improve logging git-svn-id: https://svn.argeo.org/slc/trunk@1263 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/slc/ant/AntSlcApplication.java | 7 ++++--- .../src/main/java/org/argeo/slc/cli/SlcMain.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java index a63e56d66..aac37a3b1 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java @@ -49,8 +49,9 @@ public class AntSlcApplication { // Properties and app logging initialization initSystemProperties(properties); Log4jUtils.initLog4j("classpath:" + DEFAULT_APP_LOG4J_PROPERTIES); - - log.info("### Start SLC execution " + slcExecution.getUuid() + " ###"); + + log.info("\n###\n### Start SLC execution " + slcExecution.getUuid() + + "\n###\n"); if (log.isDebugEnabled()) { log.debug("rootDir=" + rootDir); log.debug("confDir=" + confDir); @@ -63,7 +64,7 @@ public class AntSlcApplication { // Ant coordinates Resource script = findAntScript(slcExecution); List targets = findAntTargets(slcExecution); - + // Ant project initialization Project project = new Project(); AntExecutionContext executionContext = new AntExecutionContext(project); diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java index 39ff6aa41..fd6a40209 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java @@ -146,14 +146,14 @@ public class SlcMain { } private static void initLogging(Properties userProperties) { + System.setProperty("log4j.defaultInitOverride", "true"); + // Add log4j user properties to System properties for (String key : userProperties.stringPropertyNames()) { if (key.startsWith("log4j.")) { - System.setProperty(key, userProperties.getProperty(key)); + System.setProperty(key, userProperties.getProperty(key)); } } - - System.setProperty("log4j.defaultInitOverride", "true"); Log4jUtils.initLog4j(System.getProperty("log4j.configuration", "classpath:" + BOOTSTRAP_LOG4J_CONFIG)); log = LogFactory.getLog(SlcMain.class); -- 2.39.2