Skip to content

Commit

Permalink
Issue #4830 - Add JMX to new Jetty 10 jetty-slf4j-impl.
Browse files Browse the repository at this point in the history 
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
  • Loading branch information
@sbordet
sbordet committed May 8, 2020
1 parent 69e1d11 commit d6d994d
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 120 deletions.
227 changes: 111 additions & 116 deletions jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,48 @@ private static String condensePackageString(String classname)
return dense.toString();
}

public JettyAppender getAppender()
{
return appender;
}

String getCondensedName()
{
return condensedName;
}

public JettyLevel getLevel()
{
return level;
}

public void setLevel(JettyLevel level)
{
this.level = level;

// apply setLevel to children too.
factory.walkChildrenLoggers(this.getName(), (logger) -> logger.setLevel(level));
}

@Override
public String getName()
{
return name;
}

public boolean isHideStacks()
{
return hideStacks;
}

public void setHideStacks(boolean hideStacks)
{
this.hideStacks = hideStacks;

// apply setHideStacks to children too.
factory.walkChildrenLoggers(this.getName(), (logger) -> logger.setHideStacks(hideStacks));
}

@Override
public void debug(String msg)
{
Expand Down Expand Up @@ -154,12 +196,6 @@ public void debug(String msg, Throwable throwable)
}
}

@Override
public boolean isDebugEnabled(Marker marker)
{
return isDebugEnabled();
}

@Override
public void debug(Marker marker, String msg)
{
Expand Down Expand Up @@ -195,6 +231,18 @@ public void debug(Marker marker, String msg, Throwable t)
debug(msg, t);
}

@Override
public boolean isDebugEnabled()
{
return level.includes(JettyLevel.DEBUG);
}

@Override
public boolean isDebugEnabled(Marker marker)
{
return isDebugEnabled();
}

@Override
public void error(String msg)
{
Expand Down Expand Up @@ -240,12 +288,6 @@ public void error(String msg, Throwable throwable)
}
}

@Override
public boolean isErrorEnabled(Marker marker)
{
return isErrorEnabled();
}

@Override
public void error(Marker marker, String msg)
{
Expand Down Expand Up @@ -281,65 +323,16 @@ public void error(Marker marker, String msg, Throwable t)
error(msg, t);
}

public JettyAppender getAppender()
{
return appender;
}

/**
* Entry point for {@link LocationAwareLogger}
*/
@Override
public void log(Marker marker, String fqcn, int levelInt, String message, Object[] argArray, Throwable throwable)
{
if (this.level.toInt() <= levelInt)
{
long timestamp = System.currentTimeMillis();
String threadName = Thread.currentThread().getName();
getAppender().emit(this, JettyLevel.intToLevel(levelInt).toLevel(), timestamp, threadName, throwable, message, argArray);
}
}

/**
* Dynamic (via Reflection) entry point for {@link SubstituteLogger} usage.
*
* @param event the logging event
*/
@SuppressWarnings("unused")
public void log(LoggingEvent event)
{
// TODO: do we want to support org.sfl4j.Marker?
// TODO: do we want to support org.sfl4j.even.KeyValuePair?
getAppender().emit(this, event.getLevel(), event.getTimeStamp(), event.getThreadName(), event.getThrowable(), event.getMessage(), event.getArgumentArray());
}

public String getCondensedName()
{
return condensedName;
}

public JettyLevel getLevel()
{
return level;
}

public void setLevel(Level level)
{
setLevel(JettyLevel.fromLevel(level));
}

public void setLevel(JettyLevel level)
public boolean isErrorEnabled()
{
this.level = level;

// apply setLevel to children too.
factory.walkChildrenLoggers(this.getName(), (logger) -> logger.setLevel(level));
return level.includes(JettyLevel.ERROR);
}

@Override
public String getName()
public boolean isErrorEnabled(Marker marker)
{
return name;
return isErrorEnabled();
}

@Override
Expand Down Expand Up @@ -387,12 +380,6 @@ public void info(String msg, Throwable throwable)
}
}

@Override
public boolean isInfoEnabled(Marker marker)
{
return isInfoEnabled();
}

@Override
public void info(Marker marker, String msg)
{
Expand Down Expand Up @@ -428,47 +415,16 @@ public void info(Marker marker, String msg, Throwable t)
info(msg, t);
}

@Override
public boolean isDebugEnabled()
{
return level.includes(JettyLevel.DEBUG);
}

@Override
public boolean isErrorEnabled()
{
return level.includes(JettyLevel.ERROR);
}

public boolean isHideStacks()
{
return hideStacks;
}

public void setHideStacks(boolean hideStacks)
{
this.hideStacks = hideStacks;

// apply setHideStacks to children too.
factory.walkChildrenLoggers(this.getName(), (logger) -> logger.setHideStacks(hideStacks));
}

@Override
public boolean isInfoEnabled()
{
return level.includes(JettyLevel.INFO);
}

@Override
public boolean isTraceEnabled()
{
return level.includes(JettyLevel.TRACE);
}

@Override
public boolean isWarnEnabled()
public boolean isInfoEnabled(Marker marker)
{
return level.includes(JettyLevel.WARN);
return isInfoEnabled();
}

@Override
Expand Down Expand Up @@ -516,12 +472,6 @@ public void trace(String msg, Throwable throwable)
}
}

@Override
public boolean isTraceEnabled(Marker marker)
{
return isTraceEnabled();
}

@Override
public void trace(Marker marker, String msg)
{
Expand Down Expand Up @@ -557,6 +507,18 @@ public void trace(Marker marker, String msg, Throwable t)
trace(msg, t);
}

@Override
public boolean isTraceEnabled()
{
return level.includes(JettyLevel.TRACE);
}

@Override
public boolean isTraceEnabled(Marker marker)
{
return isTraceEnabled();
}

@Override
public void warn(String msg)
{
Expand Down Expand Up @@ -602,12 +564,6 @@ public void warn(String msg, Throwable throwable)
}
}

@Override
public boolean isWarnEnabled(Marker marker)
{
return isWarnEnabled();
}

@Override
public void warn(Marker marker, String msg)
{
Expand Down Expand Up @@ -643,6 +599,18 @@ public void warn(Marker marker, String msg, Throwable t)
warn(msg, t);
}

@Override
public boolean isWarnEnabled()
{
return level.includes(JettyLevel.WARN);
}

@Override
public boolean isWarnEnabled(Marker marker)
{
return isWarnEnabled();
}

private void emit(Level level, String msg)
{
long timestamp = System.currentTimeMillis();
Expand Down Expand Up @@ -684,6 +652,33 @@ private void emit(Level level, String msg, Throwable throwable)
getAppender().emit(this, level, timestamp, threadName, throwable, msg);
}

/**
* Entry point for {@link LocationAwareLogger}
*/
@Override
public void log(Marker marker, String fqcn, int levelInt, String message, Object[] argArray, Throwable throwable)
{
if (this.level.toInt() <= levelInt)
{
long timestamp = System.currentTimeMillis();
String threadName = Thread.currentThread().getName();
getAppender().emit(this, JettyLevel.intToLevel(levelInt).toLevel(), timestamp, threadName, throwable, message, argArray);
}
}

/**
* Dynamic (via Reflection) entry point for {@link SubstituteLogger} usage.
*
* @param event the logging event
*/
@SuppressWarnings("unused")
public void log(LoggingEvent event)
{
// TODO: do we want to support org.sfl4j.Marker?
// TODO: do we want to support org.sfl4j.even.KeyValuePair?
getAppender().emit(this, event.getLevel(), event.getTimeStamp(), event.getThreadName(), event.getThrowable(), event.getMessage(), event.getArgumentArray());
}

@Override
public String toString()
{
Expand Down
2 changes: 1 addition & 1 deletion jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protected static JettyLevel toJettyLevel(String loggerName, String levelStr)
if (level == null)
{
System.err.printf("Unknown JettyLogger/Slf4J Level [%s]=[%s], expecting only [%s] as values.",
loggerName, levelStr, Stream.of(JettyLevel.values()).map(JettyLevel::toString).collect(Collectors.joining(", ")));
loggerName, levelStr, Stream.of(JettyLevel.values()).map(JettyLevel::name).collect(Collectors.joining(", ")));
}
return level;
}
Expand Down
2 changes: 1 addition & 1 deletion jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public String getLoggerLevel(String loggerName)
{
JettyLogger logger = loggerMap.get(key);
if (logger != null)
return logger.getLevel().toString();
return logger.getLevel().name();
return null;
});
}
Expand Down
3 changes: 1 addition & 2 deletions jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
import org.xml.sax.SAXException;

import static java.nio.charset.StandardCharsets.UTF_8;
Expand Down Expand Up @@ -1602,7 +1601,7 @@ private ByteArrayOutputStream captureLoggingBytes(ThrowableAction action) throws
// capture events
appender.setStream(new PrintStream(logBytes, true));
// make sure we are seeing WARN level events
jettyLogger.setLevel(Level.WARN);
jettyLogger.setLevel(JettyLevel.WARN);

action.run();
}
Expand Down

0 comments on commit d6d994d

Please sign in to comment.