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

Merge pull request #3941 from eclipse/jetty-9.4.x-3940-double_log_initialization 

Fixes #3940 - Double initialization of Log.
This commit is contained in:
Simone Bordet 2019-08-07 11:52:58 +03:00 committed by GitHub
parent 9950f6b528 1fd24b3fca
commit 6c4412bd75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
View File

@ -23,9 +23,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/**
* Fast String Utilities.
*
@ -36,8 +33,6 @@ import org.eclipse.jetty.util.log.Logger;
*/
public class StringUtil
{
private static final Logger LOG = Log.getLogger(StringUtil.class);
private static final Trie<String> CHARSETS = new ArrayTrie<>(256);
public static final String ALL_INTERFACES = "0.0.0.0";
@ -496,7 +491,6 @@ public class StringUtil
}
catch (UnsupportedEncodingException e)
{
LOG.warn(e);
throw new IllegalArgumentException(e);
}
}

83
jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java
View File

@ -33,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.Uptime;
import org.eclipse.jetty.util.annotation.ManagedAttribute;
@ -57,11 +56,6 @@ public class Log
{
public static final String EXCEPTION = "EXCEPTION ";
public static final String IGNORED = "IGNORED EXCEPTION ";
/**
* Logging Configuration Properties
*/
protected static final Properties __props;
/**
* The {@link Logger} implementation class name
*/
@ -70,60 +64,51 @@ public class Log
* Legacy flag indicating if {@link Logger#ignore(Throwable)} methods produce any output in the {@link Logger}s
*/
public static boolean __ignored;
/**
* Hold loggers only.
* Logging Configuration Properties
*/
protected static final Properties __props = new Properties();
private static final ConcurrentMap<String, Logger> __loggers = new ConcurrentHashMap<>();
private static boolean __initialized;
private static Logger LOG;
static
{
/* Instantiate a default configuration properties (empty)
*/
__props = new Properties();
AccessController.doPrivileged(new PrivilegedAction<Object>()
{
@Override
public Object run()
{
/* First see if the jetty-logging.properties object exists in the classpath.
* This is an optional feature used by embedded mode use, and test cases to allow for early
* configuration of the Log class in situations where access to the System.properties are
* either too late or just impossible.
*/
// First see if the jetty-logging.properties object exists in the classpath.
// * This is an optional feature used by embedded mode use, and test cases to allow for early
// * configuration of the Log class in situations where access to the System.properties are
// * either too late or just impossible.
loadProperties("jetty-logging.properties", __props);
/*
* Next see if an OS specific jetty-logging.properties object exists in the classpath.
* This really for setting up test specific logging behavior based on OS.
*/
// Next see if an OS specific jetty-logging.properties object exists in the classpath.
// This really for setting up test specific logging behavior based on OS.
String osName = System.getProperty("os.name");
// NOTE: cannot use jetty-util's StringUtil as that initializes logging itself.
if (osName != null && osName.length() > 0)
{
osName = StringUtil.replace(osName.toLowerCase(Locale.ENGLISH), ' ', '-');
// NOTE: cannot use jetty-util's StringUtil.replace() as it may initialize logging itself.
osName = osName.toLowerCase(Locale.ENGLISH).replace(' ', '-');
loadProperties("jetty-logging-" + osName + ".properties", __props);
}
/* Now load the System.properties as-is into the __props, these values will override
* any key conflicts in __props.
*/
// Now load the System.properties as-is into the __props,
// these values will override any key conflicts in __props.
@SuppressWarnings("unchecked")
Enumeration<String> systemKeyEnum = (Enumeration<String>)System.getProperties().propertyNames();
while (systemKeyEnum.hasMoreElements())
{
String key = systemKeyEnum.nextElement();
String val = System.getProperty(key);
// protect against application code insertion of non-String values (returned as null)
// Protect against application code insertion of non-String values (returned as null).
if (val != null)
{
__props.setProperty(key, val);
}
}
/* Now use the configuration properties to configure the Log statics
*/
// Now use the configuration properties to configure the Log statics.
__logClass = __props.getProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.Slf4jLog");
__ignored = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.IGNORED", "false"));
return null;
@ -131,7 +116,7 @@ public class Log
});
}
static void loadProperties(String resourceName, Properties props)
private static void loadProperties(String resourceName, Properties props)
{
URL testProps = Loader.getResource(resourceName);
if (testProps != null)
@ -144,22 +129,17 @@ public class Log
{
Object value = p.get(key);
if (value != null)
{
props.put(key, value);
}
}
}
catch (IOException e)
{
System.err.println("[WARN] Error loading logging config: " + testProps);
e.printStackTrace(System.err);
e.printStackTrace();
}
}
}
private static Logger LOG;
private static boolean __initialized = false;
public static void initialized()
{
synchronized (Log.class)
@ -168,18 +148,15 @@ public class Log
return;
__initialized = true;
Boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true"));
boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true"));
try
{
Class<?> logClass = __logClass == null ? null : Loader.loadClass(Log.class, __logClass);
if (LOG == null || (logClass != null && !LOG.getClass().equals(logClass)))
Class<?> logClass = Loader.loadClass(Log.class, __logClass);
if (LOG == null || !LOG.getClass().equals(logClass))
{
LOG = (Logger)logClass.getDeclaredConstructor().newInstance();
if (announce)
{
LOG.debug("Logging to {} via {}", LOG, logClass.getName());
}
}
}
catch (Throwable e)
@ -189,31 +166,17 @@ public class Log
}
if (announce && LOG != null)
{
LOG.info(String.format("Logging initialized @%dms to %s", Uptime.getUptime(), LOG.getClass().getName()));
}
}
}
private static void initStandardLogging(Throwable e)
{
Class<?> logClass;
if (e != null && __ignored)
{
e.printStackTrace(System.err);
}
if (__ignored)
e.printStackTrace();
if (LOG == null)
{
logClass = StdErrLog.class;
LOG = new StdErrLog();
boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true"));
if (announce)
{
LOG.debug("Logging to {} via {}", LOG, logClass.getName());
}
}
}
public static Logger getLog()