Repository: karaf Updated Branches: refs/heads/master b59caa283 -> b2be159cc
[KARAF-4740] Upgrade to pax-logging 1.9.0 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/85eaedd8 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/85eaedd8 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/85eaedd8 Branch: refs/heads/master Commit: 85eaedd858dcd8acf2d79b49fa1654c02e53ccf6 Parents: b59caa2 Author: Guillaume Nodet <[email protected]> Authored: Thu Sep 29 21:08:18 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Mon Oct 3 10:07:46 2016 +0200 ---------------------------------------------------------------------- .../features/base/src/main/resources/resources/bin/karaf | 2 +- .../base/src/main/resources/resources/bin/karaf.bat | 2 +- .../resources/resources/etc/org.ops4j.pax.logging.cfg | 6 ++---- itests/src/test/resources/etc/org.ops4j.pax.logging.cfg | 4 +++- .../org/apache/karaf/main/util/BootstrapLogManager.java | 11 +++++------ pom.xml | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf index f78f8c7..cc7ae29 100755 --- a/assemblies/features/base/src/main/resources/resources/bin/karaf +++ b/assemblies/features/base/src/main/resources/resources/bin/karaf @@ -437,7 +437,7 @@ run() { shift ;; 'run') - OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=true" + OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=ALL" shift ;; 'daemon') http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat index 9effa44..9ebb339 100644 --- a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat +++ b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat @@ -335,7 +335,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN goto :RUN_LOOP :EXECUTE_RUN - SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=true + SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -Dkaraf.log.console=ALL shift goto :RUN_LOOP http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg index 8e12a84..9ee5300 100644 --- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg +++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg @@ -25,13 +25,13 @@ log4j2.rootLogger.level = INFO # uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library #log4j2.rootLogger.type = asyncRoot #log4j2.rootLogger.includeLocation = false -log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console} log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi log4j2.rootLogger.appenderRef.Console.ref = Console +log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter +log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF} # Loggers configuration -log4j2.loggers = audit, spifly # Spifly logger log4j2.logger.spifly.name = org.apache.aries.spifly @@ -41,11 +41,9 @@ log4j2.logger.spifly.level = WARN log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit log4j2.logger.audit.level = INFO log4j2.logger.audit.additivity = false -log4j2.logger.audit.appenderRefs = AuditRollingFile log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile # Appenders configuration -log4j2.appenders = console, rolling, audit, osgi # Console appender not used by default (see log4j2.rootLogger.appenderRefs) log4j2.appender.console.type = Console http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg index 48e1069..66c1e4f 100644 --- a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg +++ b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg @@ -25,10 +25,12 @@ log4j2.rootLogger.level = INFO # uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library #log4j2.rootLogger.type = asyncRoot #log4j2.rootLogger.includeLocation = false -log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console} +log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi, Console log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi log4j2.rootLogger.appenderRef.Console.ref = Console +log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter +log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF} # Appenders configuration log4j2.appenders = console, rolling, osgi http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java index 9117525..1f57502 100644 --- a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java +++ b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java @@ -28,10 +28,10 @@ import org.apache.felix.utils.properties.Properties; import org.apache.felix.utils.properties.InterpolationHelper; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.logging.ConsoleHandler; import java.util.logging.Handler; +import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.logging.StreamHandler; @@ -104,11 +104,10 @@ public class BootstrapLogManager { } private List<Handler> getDefaultHandlersInternal() { - if (Boolean.getBoolean("karaf.log.console")) { - return Arrays.asList(new ConsoleHandler(), getDefaultHandlerInternal()); - } else { - return Collections.singletonList(getDefaultHandlerInternal()); - } + String consoleLevel = System.getProperty("karaf.log.console", "OFF"); + ConsoleHandler handler = new ConsoleHandler(); + handler.setLevel(Level.parse(consoleLevel)); + return Arrays.asList(handler, getDefaultHandlerInternal()); } private Properties loadPaxLoggingConfig() { http://git-wip-us.apache.org/repos/asf/karaf/blob/85eaedd8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index da0401b..a1c8fda 100644 --- a/pom.xml +++ b/pom.xml @@ -264,7 +264,7 @@ <pax.cdi.version>0.12.0</pax.cdi.version> <pax.exam.version>4.10.0-SNAPSHOT</pax.exam.version> - <pax.logging.version>1.8.5</pax.logging.version> + <pax.logging.version>1.9.0</pax.logging.version> <pax.base.version>1.5.0</pax.base.version> <pax.url.version>2.4.7</pax.url.version> <pax.web.version>6.0.0-SNAPSHOT</pax.web.version>
