From d9392a683deb0dee00d8e61f4459fe4115472e9e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 5 Oct 2008 15:42:10 +0000 Subject: [PATCH] Improve logging and project structure git-svn-id: https://svn.argeo.org/slc/trunk@1704 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/slc/cli/SlcMain.java | 12 +++++++++--- .../org/argeo/slc/ant/defaultAppLog4j.properties | 5 +++++ 2 files changed, 14 insertions(+), 3 deletions(-) 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 e46bc8434..dccced3e5 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 @@ -154,9 +154,15 @@ public class SlcMain { // Execution if (mode.equals(Mode.single)) { - DefaultSlcRuntime runtime = new DefaultSlcRuntime(); - runtime.executeScript(runtimeStr, script, targets, properties, - null, null); + try { + DefaultSlcRuntime runtime = new DefaultSlcRuntime(); + runtime.executeScript(runtimeStr, script, targets, properties, + null, null); + System.exit(0); + } catch (SlcException e) { + log.error("SLC client terminated with an error: ", e); + System.exit(1); + } } } diff --git a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties index 3803c75d0..c13c36f80 100644 --- a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties +++ b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ant/defaultAppLog4j.properties @@ -3,6 +3,11 @@ log4j.rootLogger=WARN, console, file ## Levels log4j.logger.org.argeo=INFO +## Ant (Ant error logging is to verbose) +log4j.logger.org.apache.tools.ant.UnknownElement=OFF +log4j.logger.org.apache.tools.ant.Target=OFF +log4j.logger.org.apache.tools.ant.Project=OFF + ## Appenders # console uses PatternLayout. log4j.appender.console=org.apache.log4j.ConsoleAppender -- 2.39.2