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

Updating java comments to make clear the purpose of this new static{} block

This commit is contained in:
Joakim Erdfelt 2011-10-28 10:57:32 -07:00
parent 4947bf099a
commit aa73830199
2 changed files with 21 additions and 1 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/Log.java
View File

@ -46,18 +46,34 @@ public class Log
public final static String EXCEPTION= "EXCEPTION "; public final static String EXCEPTION= "EXCEPTION ";
public final static String IGNORED= "IGNORED "; public final static String IGNORED= "IGNORED ";
/**
* Logging Configuration Properties
*/
protected static Properties __props; protected static Properties __props;
/**
* The {@link Logger} implementation class name
*/
public static String __logClass; public static String __logClass;
/**
* Legacy flag indicating if {@link Log#ignore(Throwable)} methods produce any output in the {@link Logger}s
*/
public static boolean __ignored; public static boolean __ignored;
static static
{ {
/* Instantiate a default configuration properties (empty)
*/
__props = new Properties(); __props = new Properties();
AccessController.doPrivileged(new PrivilegedAction<Object>() AccessController.doPrivileged(new PrivilegedAction<Object>()
{ {
public Object run() 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 in situations where access to the System.properties is
* impossible.
*/
URL testProps = Log.class.getClassLoader().getResource("jetty-logging.properties"); URL testProps = Log.class.getClassLoader().getResource("jetty-logging.properties");
if (testProps != null) if (testProps != null)
{ {
@ -78,6 +94,9 @@ public class Log
} }
} }
/* Now load the System.properties as-is into the __props, these values will override
* any key conflicts in __props.
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Enumeration<String> systemKeyEnum = (Enumeration<String>)System.getProperties().propertyNames(); Enumeration<String> systemKeyEnum = (Enumeration<String>)System.getProperties().propertyNames();
while (systemKeyEnum.hasMoreElements()) while (systemKeyEnum.hasMoreElements())
@ -86,6 +105,8 @@ public class Log
__props.setProperty(key,System.getProperty(key)); __props.setProperty(key,System.getProperty(key));
} }
/* 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"); __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")); __ignored = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.IGNORED","false"));
return null; return null;

1
jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
View File

@ -37,7 +37,6 @@ public class Slf4jLog implements Logger
} }
catch (ClassNotFoundException ex) catch (ClassNotFoundException ex)
{ {
ex.printStackTrace(System.err);
throw new NoClassDefFoundError("org.slf4j.impl.StaticLoggerBinder"); throw new NoClassDefFoundError("org.slf4j.impl.StaticLoggerBinder");
} }