You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/06/01 02:52:03 UTC

[68/94] [abbrv] incubator-joshua git commit: FIX: override logger settings at runtime

FIX: override logger settings at runtime

Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/37420cd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/37420cd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/37420cd0

Branch: refs/heads/master
Commit: 37420cd0b352356d782ba1c6b35ad9b84c1f61cb
Parents: 7bc2d79
Author: Thamme Gowda <tg...@gmail.com>
Authored: Fri May 27 11:45:46 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Fri May 27 11:45:46 2016 -0700

----------------------------------------------------------------------
 bin/joshua-decoder                  | 6 +++---
 src/main/resources/log4j.properties | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/37420cd0/bin/joshua-decoder
----------------------------------------------------------------------
diff --git a/bin/joshua-decoder b/bin/joshua-decoder
index 70b2bfb..ed2bdb9 100755
--- a/bin/joshua-decoder
+++ b/bin/joshua-decoder
@@ -33,7 +33,6 @@ mem=4g
 
 if [[ $1 == "-m" ]]; then
     mem=$2
-
     shift
     shift
 fi
@@ -41,10 +40,11 @@ fi
 set -u
 
 JOSHUA=$(dirname $0)/..
+JAR_PATH=$(find "$JOSHUA"/target/joshua-*-jar-with-dependencies.jar)
+RES_OVERRIDE_PATH="$JOSHUA"/src/main/resources/
 
 exec java -Xmx${mem} \
 	-Dfile.encoding=utf8 \
-	-Dlog4j.configuration=$JOSHUA/src/main/resources/log4j.properties \
 	-Djava.library.path=$JOSHUA/lib \
-	-cp $JOSHUA/target/joshua-*-jar-with-dependencies.jar \
+	-cp "$RES_OVERRIDE_PATH:$JAR_PATH" \
 	org.apache.joshua.decoder.JoshuaDecoder "$@"

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/37420cd0/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 13e19bf..2193edc 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
 # log4j settings
-log4j.rootLogger=OFF, stdout
+log4j.rootLogger=WARN, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout