You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/07/04 11:13:18 UTC

[1/2] karaf git commit: [KARAF-5116] We may use log4j(2) levels in karaf.log.console property

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x d111d7f22 -> 2384d2a1d
  refs/heads/master 28c0864a9 -> 9946fb23d


[KARAF-5116] We may use log4j(2) levels in karaf.log.console property


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9946fb23
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9946fb23
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9946fb23

Branch: refs/heads/master
Commit: 9946fb23d006a47f202ceed868321cc0a67a72b0
Parents: 28c0864
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Tue Jul 4 13:10:15 2017 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Tue Jul 4 13:10:15 2017 +0200

----------------------------------------------------------------------
 .../karaf/main/util/BootstrapLogManager.java    | 29 +++++++++++++++++++-
 manual/src/main/asciidoc/user-guide/log.adoc    | 19 ++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/9946fb23/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 1f57502..7c9f9dd 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
@@ -105,8 +105,35 @@ public class BootstrapLogManager {
 
     private List<Handler> getDefaultHandlersInternal() {
         String consoleLevel = System.getProperty("karaf.log.console", "OFF");
+        Level level = null;
+        try {
+            level = Level.parse(consoleLevel);
+        } catch (IllegalArgumentException e) {
+            // KARAF-5116: let's try *some* of log4j(2) log levels (org.apache.karaf.log.core.Level)
+            switch (consoleLevel) {
+                case "TRACE":
+                    level = Level.FINEST;
+                    break;
+                case "DEBUG":
+                    level = Level.FINE;
+                    break;
+                case "WARN":
+                    level = Level.WARNING;
+                    break;
+                case "ERROR":
+                    level = Level.SEVERE;
+                    break;
+                case "DEFAULT":
+                    level = Level.INFO;
+                    break;
+                case "OFF":
+                default:
+                    level = Level.OFF;
+                    break;
+            }
+        }
         ConsoleHandler handler = new ConsoleHandler();
-        handler.setLevel(Level.parse(consoleLevel));
+        handler.setLevel(level);
         return Arrays.asList(handler, getDefaultHandlerInternal());
     }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/9946fb23/manual/src/main/asciidoc/user-guide/log.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc b/manual/src/main/asciidoc/user-guide/log.adoc
index 664a3f5..9cfe952 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -173,7 +173,24 @@ levels:
 * `CONFIG`
 * `FINE`
 * `FINER`
-* `FINEST`  (lowest value)
+* `FINEST` (lowest value)
+
+Additionally, de-facto standard log4j(2) levels can be used:
+
+* `TRACE`
+* `DEBUG`
+* `INFO`
+* `WARN`
+* `ERROR`
+* `OFF`
+* `DEFAULT`
+
+And because `org.ops4j.pax.loggin` PID uses `karaf.log.console` property, it's in fact better to use log4j levels instead:
+
+[source,options="nowrap"]
+----
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
+----
 
 For example, setting `karaf.log.console` to `INFO` (or lower) will turn on these logs when starting Karaf:
 


[2/2] karaf git commit: [KARAF-5116] We may use log4j(2) levels in karaf.log.console property

Posted by gg...@apache.org.
[KARAF-5116] We may use log4j(2) levels in karaf.log.console property

(cherry picked from commit 9946fb23d006a47f202ceed868321cc0a67a72b0)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2384d2a1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2384d2a1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2384d2a1

Branch: refs/heads/karaf-4.1.x
Commit: 2384d2a1d216000348bcded27555ef7eec927c52
Parents: d111d7f
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Tue Jul 4 13:10:15 2017 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Tue Jul 4 13:12:50 2017 +0200

----------------------------------------------------------------------
 .../karaf/main/util/BootstrapLogManager.java    | 29 +++++++++++++++++++-
 manual/src/main/asciidoc/user-guide/log.adoc    | 19 ++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/2384d2a1/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 1f57502..7c9f9dd 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
@@ -105,8 +105,35 @@ public class BootstrapLogManager {
 
     private List<Handler> getDefaultHandlersInternal() {
         String consoleLevel = System.getProperty("karaf.log.console", "OFF");
+        Level level = null;
+        try {
+            level = Level.parse(consoleLevel);
+        } catch (IllegalArgumentException e) {
+            // KARAF-5116: let's try *some* of log4j(2) log levels (org.apache.karaf.log.core.Level)
+            switch (consoleLevel) {
+                case "TRACE":
+                    level = Level.FINEST;
+                    break;
+                case "DEBUG":
+                    level = Level.FINE;
+                    break;
+                case "WARN":
+                    level = Level.WARNING;
+                    break;
+                case "ERROR":
+                    level = Level.SEVERE;
+                    break;
+                case "DEFAULT":
+                    level = Level.INFO;
+                    break;
+                case "OFF":
+                default:
+                    level = Level.OFF;
+                    break;
+            }
+        }
         ConsoleHandler handler = new ConsoleHandler();
-        handler.setLevel(Level.parse(consoleLevel));
+        handler.setLevel(level);
         return Arrays.asList(handler, getDefaultHandlerInternal());
     }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/2384d2a1/manual/src/main/asciidoc/user-guide/log.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc b/manual/src/main/asciidoc/user-guide/log.adoc
index 664a3f5..9cfe952 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -173,7 +173,24 @@ levels:
 * `CONFIG`
 * `FINE`
 * `FINER`
-* `FINEST`  (lowest value)
+* `FINEST` (lowest value)
+
+Additionally, de-facto standard log4j(2) levels can be used:
+
+* `TRACE`
+* `DEBUG`
+* `INFO`
+* `WARN`
+* `ERROR`
+* `OFF`
+* `DEFAULT`
+
+And because `org.ops4j.pax.loggin` PID uses `karaf.log.console` property, it's in fact better to use log4j levels instead:
+
+[source,options="nowrap"]
+----
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
+----
 
 For example, setting `karaf.log.console` to `INFO` (or lower) will turn on these logs when starting Karaf: