Issue #5872 - DynamicMBean for JettyLoggerFactory

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Jan 22, 2021 · 5f9ea78 · 5f9ea78
1 parent 87ab8bd
commit 5f9ea78
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 39 deletions.
diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
@@ -35,7 +35,7 @@
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 
-public class JettyLoggerFactory implements ILoggerFactory, DynamicMBean, JettyLoggerFactoryMBean
+public class JettyLoggerFactory implements ILoggerFactory, DynamicMBean
 {
     private final JettyLoggerConfiguration configuration;
     private final JettyLogger rootLogger;
@@ -254,11 +254,6 @@ public AttributeList setAttributes(AttributeList attributes)
         return ret;
     }
 
-    /*
-    setLoggerLevel(String loggerName, String levelName);
-    String getLoggerLevel(String loggerName);
-     */
-
     @Override
     public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException, ReflectionException
     {

diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactoryMBean.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactoryMBean.java
diff --git a/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/JMXTest.java b/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/JMXTest.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
-import javax.management.JMX;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
@@ -52,28 +51,44 @@ public void testJMX() throws Exception
         MBeanAttributeInfo attr = Stream.of(attributeInfos).filter((a) -> a.getName().equals("LoggerNames")).findFirst().orElseThrow();
         assertThat("attr", attr.getDescription(), is("List of Registered Loggers by Name."));
 
-        JettyLoggerFactoryMBean mbean = JMX.newMBeanProxy(mbeanServer, objectName, JettyLoggerFactoryMBean.class);
+        // Do some MBean attribute testing
+        int loggerCount;
 
         // Only the root logger.
-        assertEquals(1, mbean.getLoggerCount());
+        loggerCount = (int)mbeanServer.getAttribute(objectName, "LoggerCount");
+        assertEquals(1, loggerCount);
 
         JettyLoggerFactory loggerFactory = (JettyLoggerFactory)LoggerFactory.getILoggerFactory();
         JettyLogger child = loggerFactory.getJettyLogger("org.eclipse.jetty.logging");
         JettyLogger parent = loggerFactory.getJettyLogger("org.eclipse.jetty");
-        assertEquals(3, mbean.getLoggerCount());
+        loggerCount = (int)mbeanServer.getAttribute(objectName, "LoggerCount");
+        assertEquals(3, loggerCount);
 
-        // Names are sorted.
+        // Names from JMX are sorted, so lets sort our expected list too.
         List<String> expected = new ArrayList<>(Arrays.asList(JettyLogger.ROOT_LOGGER_NAME, parent.getName(), child.getName()));
         expected.sort(String::compareTo);
-        String[] loggerNames = mbean.getLoggerNames();
+        String[] loggerNames = (String[])mbeanServer.getAttribute(objectName, "LoggerNames");
         assertEquals(expected, Arrays.asList(loggerNames));
 
+        // Do some MBean invoker testing
+        String operationName;
+        String[] signature;
+        Object[] params;
+
         // Setting the parent level should propagate to the children.
         parent.setLevel(JettyLevel.DEBUG);
-        assertEquals(parent.getLevel().toString(), mbean.getLoggerLevel(child.getName()));
+        operationName = "getLoggerName";
+        signature = new String[]{String.class.getName()};
+        params = new Object[]{child.getName()};
+        String levelName = (String)mbeanServer.invoke(objectName, operationName, params, signature);
+        assertEquals(parent.getLevel().toString(), levelName);
 
         // Setting the level via JMX affects the logger.
-        assertTrue(mbean.setLoggerLevel(child.getName(), "INFO"));
+        operationName = "setLoggerName";
+        signature = new String[]{String.class.getName(), String.class.getName()};
+        params = new Object[]{child.getName(), "INFO"};
+        boolean result = (boolean)mbeanServer.invoke(objectName, operationName, params, signature);
+        assertTrue(result);
         assertEquals(JettyLevel.INFO, child.getLevel());
     }
 }