Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #4567 - Applying changes from PR review 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-02-18 11:09:46 -06:00
parent 3f3eaf2182
commit c9134df60a
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java
View File

@ -63,14 +63,13 @@ import org.eclipse.jetty.util.Loader;
*/ */
public class JavaUtilLog extends AbstractLogger public class JavaUtilLog extends AbstractLogger
{ {
private static final String THIS_CLASS = JavaUtilLog.class.getName(); private static final boolean SOURCE =
private static final boolean __source =
Boolean.parseBoolean(Log.getProperty("org.eclipse.jetty.util.log.SOURCE", Boolean.parseBoolean(Log.getProperty("org.eclipse.jetty.util.log.SOURCE",
Log.getProperty("org.eclipse.jetty.util.log.javautil.SOURCE", "true"))); Log.getProperty("org.eclipse.jetty.util.log.javautil.SOURCE", "true")));
private static boolean _initialized = false; private static boolean __initialized = false;
private Level configuredLevel; private Level _configuredLevel;
private java.util.logging.Logger _logger; private java.util.logging.Logger _logger;
public JavaUtilLog() public JavaUtilLog()
@ -82,9 +81,9 @@ public class JavaUtilLog extends AbstractLogger
{ {
synchronized (JavaUtilLog.class) synchronized (JavaUtilLog.class)
{ {
if (!_initialized) if (!__initialized)
{ {
_initialized = true; __initialized = true;
final String properties = Log.getProperty("org.eclipse.jetty.util.log.javautil.PROPERTIES", null); final String properties = Log.getProperty("org.eclipse.jetty.util.log.javautil.PROPERTIES", null);
if (properties != null) if (properties != null)
@ -137,7 +136,7 @@ public class JavaUtilLog extends AbstractLogger
break; break;
} }
configuredLevel = _logger.getLevel(); _configuredLevel = _logger.getLevel();
} }
@Override @Override
@ -152,13 +151,13 @@ public class JavaUtilLog extends AbstractLogger
if (thrown != null) if (thrown != null)
record.setThrown(thrown); record.setThrown(thrown);
record.setLoggerName(_logger.getName()); record.setLoggerName(_logger.getName());
if (__source) if (SOURCE)
{ {
StackTraceElement[] stack = new Throwable().getStackTrace(); StackTraceElement[] stack = new Throwable().getStackTrace();
for (int i = 0; i < stack.length; i++) for (int i = 0; i < stack.length; i++)
{ {
StackTraceElement e = stack[i]; StackTraceElement e = stack[i];
if (!e.getClassName().equals(THIS_CLASS)) if (!e.getClassName().equals(JavaUtilLog.class.getName()))
{ {
record.setSourceClassName(e.getClassName()); record.setSourceClassName(e.getClassName());
record.setSourceMethodName(e.getMethodName()); record.setSourceMethodName(e.getMethodName());
@ -222,12 +221,12 @@ public class JavaUtilLog extends AbstractLogger
{ {
if (enabled) if (enabled)
{ {
configuredLevel = _logger.getLevel(); _configuredLevel = _logger.getLevel();
_logger.setLevel(Level.FINE); _logger.setLevel(Level.FINE);
} }
else else
{ {
_logger.setLevel(configuredLevel); _logger.setLevel(_configuredLevel);
} }
} }

29
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
View File

@ -21,7 +21,6 @@ package org.eclipse.jetty.util.log;
import java.io.PrintStream; import java.io.PrintStream;
import java.security.AccessControlException; import java.security.AccessControlException;
import java.util.Properties; import java.util.Properties;
import java.util.function.Function;
import org.eclipse.jetty.util.DateCache; import org.eclipse.jetty.util.DateCache;
import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedAttribute;
@ -96,7 +95,7 @@ public class StdErrLog extends AbstractLogger
private static final String EOL = System.lineSeparator(); private static final String EOL = System.lineSeparator();
private static final Object[] EMPTY_ARGS = new Object[0]; private static final Object[] EMPTY_ARGS = new Object[0];
// Do not change output format lightly, people rely on this output format now. // Do not change output format lightly, people rely on this output format now.
private static int THREADNAME_PADDING = Integer.parseInt(Log.getProperty("org.eclipse.jetty.util.log.StdErrLog.TAG_PAD", "0")); private static int __threadNamePadding = Integer.parseInt(Log.getProperty("org.eclipse.jetty.util.log.StdErrLog.TAG_PAD", "0"));
private static DateCache _dateCache; private static DateCache _dateCache;
private static final boolean SOURCE = Boolean.parseBoolean( private static final boolean SOURCE = Boolean.parseBoolean(
@ -119,7 +118,7 @@ public class StdErrLog extends AbstractLogger
public static void setTagPad(int pad) public static void setTagPad(int pad)
{ {
THREADNAME_PADDING = pad; __threadNamePadding = pad;
} }
private int _level = LEVEL_INFO; private int _level = LEVEL_INFO;
@ -341,18 +340,8 @@ public class StdErrLog extends AbstractLogger
@Override @Override
public void setDebugEnabled(boolean enabled) public void setDebugEnabled(boolean enabled)
{ {
Function<StdErrLog, Integer> lvlFunc; int level = enabled ? LEVEL_DEBUG : this.getConfiguredLevel();
this.setLevel(level);
if (enabled)
{
lvlFunc = (logger) -> LEVEL_DEBUG;
}
else
{
lvlFunc = (logger) -> logger.getConfiguredLevel();
}
this.setLevel(lvlFunc.apply(this));
String name = getName(); String name = getName();
for (Logger log : Log.getLoggers().values()) for (Logger log : Log.getLoggers().values())
@ -360,7 +349,8 @@ public class StdErrLog extends AbstractLogger
if (log.getName().startsWith(name) && log instanceof StdErrLog) if (log.getName().startsWith(name) && log instanceof StdErrLog)
{ {
StdErrLog logger = (StdErrLog)log; StdErrLog logger = (StdErrLog)log;
logger.setLevel(lvlFunc.apply(logger)); level = enabled ? LEVEL_DEBUG : logger.getConfiguredLevel();
logger.setLevel(level);
} }
} }
} }
@ -459,15 +449,12 @@ public class StdErrLog extends AbstractLogger
{ {
msgArgs = inArgs; msgArgs = inArgs;
msgArgsLen = inArgs.length; msgArgsLen = inArgs.length;
if (msgArgsLen > 0) if (msgArgsLen > 0 && inArgs[msgArgsLen - 1] instanceof Throwable)
{
if (inArgs[msgArgsLen - 1] instanceof Throwable)
{ {
cause = (Throwable)inArgs[msgArgsLen - 1]; cause = (Throwable)inArgs[msgArgsLen - 1];
msgArgsLen--; msgArgsLen--;
} }
} }
}
if (msg == null) if (msg == null)
{ {
@ -590,7 +577,7 @@ public class StdErrLog extends AbstractLogger
String name = _printLongNames ? _name : _abbrevname; String name = _printLongNames ? _name : _abbrevname;
String tname = Thread.currentThread().getName(); String tname = Thread.currentThread().getName();
int p = THREADNAME_PADDING > 0 ? (name.length() + tname.length() - THREADNAME_PADDING) : 0; int p = __threadNamePadding > 0 ? (name.length() + tname.length() - __threadNamePadding) : 0;
if (p < 0) if (p < 0)
{ {