You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2019/06/27 19:27:26 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6346]Support FATAL level
for log console commands
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 4c26f33 [KARAF-6346]Support FATAL level for log console commands
4c26f33 is described below
commit 4c26f330be981fd2073e65427c9d2e3106684966
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Jun 27 15:26:47 2019 -0400
[KARAF-6346]Support FATAL level for log console commands
(cherry picked from commit 10842cf0007c355e93c271e5c3e66d492c8c1d25)
---
log/src/main/java/org/apache/karaf/log/command/SetLogLevel.java | 4 ++--
log/src/main/java/org/apache/karaf/log/core/Level.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/log/src/main/java/org/apache/karaf/log/command/SetLogLevel.java b/log/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
index 34326a6..80257ad 100644
--- a/log/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
+++ b/log/src/main/java/org/apache/karaf/log/command/SetLogLevel.java
@@ -33,8 +33,8 @@ import org.apache.karaf.shell.support.completers.StringsCompleter;
@Service
public class SetLogLevel implements Action {
- @Argument(index = 0, name = "level", description = "The log level to set (OFF, TRACE, DEBUG, INFO, WARN, ERROR) or DEFAULT to unset", required = true, multiValued = false)
- @Completion(value = StringsCompleter.class, values = { "OFF", "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "DEFAULT" })
+ @Argument(index = 0, name = "level", description = "The log level to set (OFF, TRACE, DEBUG, INFO, WARN, ERROR, FATAL) or DEFAULT to unset", required = true, multiValued = false)
+ @Completion(value = StringsCompleter.class, values = { "OFF", "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL", "DEFAULT" })
String level;
@Argument(index = 1, name = "logger", description = "Logger name or ROOT (default)", required = false, multiValued = false)
diff --git a/log/src/main/java/org/apache/karaf/log/core/Level.java b/log/src/main/java/org/apache/karaf/log/core/Level.java
index fcde028..3f19aa4 100644
--- a/log/src/main/java/org/apache/karaf/log/core/Level.java
+++ b/log/src/main/java/org/apache/karaf/log/core/Level.java
@@ -27,6 +27,7 @@ public enum Level {
INFO,
WARN,
ERROR,
+ FATAL,
OFF,
DEFAULT;