SLING-4408 - Support setting logger levels to Off
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1659061 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java b/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
index 1d4accd..ae3b1ba 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
@@ -460,7 +460,7 @@
* {@link LogConfigManager#LOG_PATTERN_DEFAULT} is used.</dd>
* <dt>{@link LogConfigManager#LOG_LEVEL}</dt>
* <dd>The log level to use for log message limitation. The supported values
- * are <code>trace</code>, <code>debug</code>, <code>info</code>,
+ * are <code>off</code>, <code>trace</code>, <code>debug</code>, <code>info</code>,
* <code>warn</code> and <code>error</code>. Case does not matter. If this
* property is missing a <code>ConfigurationException</code> is thrown and
* this logger configuration is not used.</dd>
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java b/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
index 1e352da..420994e 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/internal/SlingLogPanel.java
@@ -86,6 +86,7 @@
Level.INFO.levelStr,
Level.DEBUG.levelStr,
Level.TRACE.levelStr,
+ Level.OFF.levelStr
};
private static final String PACKAGE_SEPARATOR = ".";
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.xml b/src/main/resources/OSGI-INF/metatype/metatype.xml
index 348f736..37a733e 100644
--- a/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -27,6 +27,7 @@
<metatype:AD id="org.apache.sling.commons.log.level"
type="String" default="info" name="%log.level.name"
description="%log.level.description">
+ <metatype:Option value="off" label="Off" />
<metatype:Option value="trace" label="Trace" />
<metatype:Option value="debug" label="Debug" />
<metatype:Option value="info" label="Information" />
