Merge pull request #165 from itesla/logback

Rename logback.xml and logback-wp5.xml
itesla · Nov 30, 2016 · 9194d77 · 9194d77
2 parents c329167 + 90e6102
commit 9194d77
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config/logback.xml → config/logback-offline.xml b/config/logback.xml → config/logback-offline.xml
diff --git a/config/logback-wp5.xml → config/logback-online.xml b/config/logback-wp5.xml → config/logback-online.xml
diff --git a/scripts/offline-mpi-task.sh b/scripts/offline-mpi-task.sh
@@ -35,8 +35,8 @@ if [ $rank = 0 ]; then
     options+=" -Dcom.sun.management.jmxremote.authenticate=false"
     options+=" -Dcom.sun.management.jmxremote.ssl=false"
     options+=" -Dlogback.configurationFile="
-    [ -f "$itesla_config_dir/logback.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
-    options+="/logback.xml"
+    [ -f "$itesla_config_dir/logback-offline.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
+    options+="/logback-offline.xml"
     $JAVA_HOME/bin/java \
 -Xmx8G \
 -verbose:gc -XX:+PrintGCTimeStamps -Xloggc:$tmpdir/gc.log \

diff --git a/scripts/online-mpi-task.sh b/scripts/online-mpi-task.sh
@@ -40,8 +40,8 @@ if [ $rank = 0 ]; then
     options+=" -Dcom.sun.management.jmxremote.ssl=false"
     options+=" -Djava.io.tmpdir=$installDir/tmp"
     options+=" -Dlogback.configurationFile="
-    [ -f "$itesla_config_dir/logback-wp5.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
-    options+="/logback-wp5.xml"
+    [ -f "$itesla_config_dir/logback-online.xml" ] && options+="$itesla_config_dir" || options+="$installDir/etc"
+    options+="/logback-online.xml"
     $JAVA_HOME/bin/java \
 -Xmx2048m \
 -verbose:gc -XX:+PrintGCTimeStamps -Xloggc:$installDir/logs/gc.log \