diff --git a/pom.xml b/pom.xml index ec509767..2da647fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1868,10 +1868,16 @@ org.slf4j slf4j-api - + + org.slf4j jcl-over-slf4j @@ -3308,6 +3314,7 @@ felix.properties, logback.xml, + logging.properties, pipeline.properties @@ -3332,6 +3339,11 @@ src/main/resources/etc/logback.xml ${deb.pipeline.config}/logback.xml + + file + src/main/resources/etc/logging.properties + ${deb.pipeline.config}/logging.properties + link true diff --git a/src/main/deb/DEBIAN/conffiles b/src/main/deb/DEBIAN/conffiles index c3a92e8d..fedd11c6 100644 --- a/src/main/deb/DEBIAN/conffiles +++ b/src/main/deb/DEBIAN/conffiles @@ -1,2 +1,3 @@ ${deb.pipeline.config}/logback.xml +${deb.pipeline.config}/logging.properties /etc/default/daisy-pipeline2 \ No newline at end of file diff --git a/src/main/resources/bin/pipeline2 b/src/main/resources/bin/pipeline2 index b198890c..b0c41400 100755 --- a/src/main/resources/bin/pipeline2 +++ b/src/main/resources/bin/pipeline2 @@ -492,6 +492,7 @@ run() { # Logback configuration file SYSTEM_PROPS="${SYSTEM_PROPS} -Dlogback.configurationFile=\"file:${PIPELINE2_CONFIG}/logback.xml\"" + SYSTEM_PROPS="${SYSTEM_PROPS} -Djava.util.logging.config.file=${PIPELINE2_CONFIG}/logging.properties" # to make ${org.daisy.pipeline.data} available in felix.properties (for felix.cache.rootdir) if [ "$ENABLE_OSGI" = "true" ]; then diff --git a/src/main/resources/bin/pipeline2.bat b/src/main/resources/bin/pipeline2.bat index d194e9fa..e4e46a2c 100755 --- a/src/main/resources/bin/pipeline2.bat +++ b/src/main/resources/bin/pipeline2.bat @@ -224,6 +224,7 @@ goto :RUN_LOOP rem Logback configuration file set SYSTEM_PROPS=%SYSTEM_PROPS% -Dlogback.configurationFile="file:%PIPELINE2_HOME:\=/%/etc/logback.xml" + set SYSTEM_PROPS=%SYSTEM_PROPS% -Djava.util.logging.config.file="%PIPELINE2_HOME:\=/%/etc/logging.properties" rem to make ${org.daisy.pipeline.data} available in felix.properties (for felix.cache.rootdir) if %ENABLE_OSGI% == true ( set SYSTEM_PROPS=%SYSTEM_PROPS% -Dorg.daisy.pipeline.data="%PIPELINE2_DATA%" diff --git a/src/main/resources/etc/logging.properties b/src/main/resources/etc/logging.properties new file mode 100644 index 00000000..aeef676f --- /dev/null +++ b/src/main/resources/etc/logging.properties @@ -0,0 +1,7 @@ +handlers= java.util.logging.ConsoleHandler +.level= FINE +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter +org.restlet.level = SEVERE +com.sun.jna.level = INFO +sun.rmi.level = INFO