You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/07/12 07:59:06 UTC

svn commit: r1835705 - in /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config: ScrConfigurationImpl.java ScrMetaTypeProvider.java

Author: cziegeler
Date: Thu Jul 12 07:59:06 2018
New Revision: 1835705

URL: http://svn.apache.org/viewvc?rev=1835705&view=rev
Log:
FELIX-5866 : scr does not respect the log level set in LoggerAdmin

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrMetaTypeProvider.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java?rev=1835705&r1=1835704&r2=1835705&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java Thu Jul 12 07:59:06 2018
@@ -216,6 +216,7 @@ public class ScrConfigurationImpl implem
 
     /**
      * Returns the current log level.
+     * Note that this log level is not used with an R7 LogService implementation.
      * @return
      */
     @Override

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrMetaTypeProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrMetaTypeProvider.java?rev=1835705&r1=1835704&r2=1835705&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrMetaTypeProvider.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrMetaTypeProvider.java Thu Jul 12 07:59:06 2018
@@ -73,7 +73,9 @@ class ScrMetaTypeProvider implements Met
 
         adList.add(new AttributeDefinitionImpl(ScrConfiguration.PROP_LOGLEVEL, "SCR Log Level",
             "Allows limiting the amount of logging information sent to the OSGi LogService."
-                + " Supported values are DEBUG, INFO, WARN, and ERROR. Default is ERROR.", AttributeDefinition.INTEGER,
+                + " Supported values are DEBUG, INFO, WARN, and ERROR. This property is not used"
+                + " if a R7 LogService implementation is available as the log level can be configured"
+                + " through that service. Default is ERROR.", AttributeDefinition.INTEGER,
             new String[]
                 { String.valueOf(this.configuration.getLogLevel()) }, 0, new String[]
                 { "Debug", "Information", "Warnings", "Error" }, new String[]