You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/09/28 17:51:37 UTC
svn commit: r1391513 - in /karaf/branches/karaf-2.3.x:
itests/src/test/java/org/apache/karaf/itests/
management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/
management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/...
Author: jbonofre
Date: Fri Sep 28 15:51:37 2012
New Revision: 1391513
URL: http://svn.apache.org/viewvc?rev=1391513&view=rev
Log:
[KARAF-1882] Add Level attribute in the LogMBean
Modified:
karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java
karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/LogMBean.java
karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/internal/LogMBeanImpl.java
Modified: karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java?rev=1391513&r1=1391512&r2=1391513&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java (original)
+++ karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java Fri Sep 28 15:51:37 2012
@@ -50,7 +50,7 @@ public class LogTest extends KarafTestSu
Attribute attribute = new Attribute("Level", "DEBUG");
connection.setAttribute(name, attribute);
String logLevel = (String) connection.getAttribute(name, "Level");
- assertEquals("DEBUG", logLevel);
+ assertEquals("Level: DEBUG", logLevel);
} finally {
if (connector != null)
connector.close();
Modified: karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/LogMBean.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/LogMBean.java?rev=1391513&r1=1391512&r2=1391513&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/LogMBean.java (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/LogMBean.java Fri Sep 28 15:51:37 2012
@@ -23,10 +23,58 @@ import java.util.List;
*/
public interface LogMBean {
+ /**
+ * Set the level of the root logger.
+ *
+ * @param level the new level value (INFO, ERROR, etc).
+ * @throws Exception
+ */
+ void setLevel(String level) throws Exception;
+
+ /**
+ * Set the level of a given logger.
+ *
+ * @param level the new level value (INFO, ERROR, etc).
+ * @param logger the target logger where to change the level.
+ * @throws Exception
+ */
+ void setLevel(String level, String logger) throws Exception;
+
+ /**
+ * Get the level of the root logger.
+ *
+ * @return the value of the level (INFO, ERROR, etc).
+ * @throws Exception
+ */
+ String getLevel() throws Exception;
+
+ /**
+ * Get the level of a given logger.
+ *
+ * @param logger the target logger.
+ * @return the level of the logger.
+ * @throws Exception
+ */
+ String getLevel(String logger) throws Exception;
+
+ /**
+ * @deprecated please, use setLevel() instead.
+ */
void set(String level) throws Exception;
+
+ /**
+ * @deprecated please, use setLevel() instead.
+ */
void set(String level, String logger) throws Exception;
+ /**
+ * @deprecated please, use getLevel() instead.
+ */
String get() throws Exception;
+
+ /**
+ * @deprecated please, use getLevel() instead.
+ */
String get(String logger) throws Exception;
}
Modified: karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/internal/LogMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/internal/LogMBeanImpl.java?rev=1391513&r1=1391512&r2=1391513&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/internal/LogMBeanImpl.java (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/log/src/main/java/org/apache/karaf/management/mbeans/log/internal/LogMBeanImpl.java Fri Sep 28 15:51:37 2012
@@ -44,11 +44,11 @@ public class LogMBeanImpl extends Standa
super(LogMBean.class);
}
- public void set(String level) throws Exception {
- set(level, null);
+ public void setLevel(String level) throws Exception {
+ setLevel(level, null);
}
- public void set(String level, String logger) throws Exception {
+ public void setLevel(String level, String logger) throws Exception {
if (ROOT_LOGGER.equalsIgnoreCase(logger)) {
logger = null;
}
@@ -103,11 +103,11 @@ public class LogMBeanImpl extends Standa
cfg.update(props);
}
- public String get() throws Exception {
- return get(null);
+ public String getLevel() throws Exception {
+ return getLevel(null);
}
- public String get(String logger) throws Exception {
+ public String getLevel(String logger) throws Exception {
ConfigurationAdmin cfgAdmin = getConfigAdmin();
Configuration cfg = cfgAdmin.getConfiguration(CONFIGURATION_PID, null);
Dictionary props = cfg.getProperties();
@@ -125,7 +125,7 @@ public class LogMBeanImpl extends Standa
prop = LOGGER_PREFIX + logger;
}
val = (String) props.get(prop);
- val = getLevel(val);
+ val = getLevelValue(val);
if (val != null || logger == null) {
break;
}
@@ -140,6 +140,22 @@ public class LogMBeanImpl extends Standa
return st;
}
+ public void set(String level) throws Exception {
+ setLevel(level);
+ }
+
+ public void set(String logger, String level) throws Exception {
+ setLevel(logger, level);
+ }
+
+ public String get() throws Exception {
+ return getLevel();
+ }
+
+ public String get(String logger) throws Exception {
+ return getLevel(logger);
+ }
+
private boolean checkIfFromRequestedLog(PaxLoggingEvent event, String logger) {
return (event.getLoggerName().lastIndexOf(logger) >= 0) ? true : false;
}
@@ -155,7 +171,7 @@ public class LogMBeanImpl extends Standa
return sb.toString();
}
- private String getLevel(String prop) {
+ private String getLevelValue(String prop) {
if (prop == null) {
return null;
} else {