Merge branch 'jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Joakim Erdfelt 2016-06-29 15:11:55 -07:00
commit c4f6d3503e
4 changed files with 5 additions and 5 deletions

View File

@ -255,8 +255,8 @@ public class JavaUtilLog extends AbstractLogger
public void ignore(Throwable ignored)
{
if (_logger.isLoggable(Level.ALL))
log(Level.WARNING,Log.IGNORED,ignored);
if (_logger.isLoggable(Level.FINEST))
log(Level.FINEST,Log.IGNORED,ignored);
}
private String format(String msg, Object... args)

View File

@ -55,7 +55,7 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute;
public class Log
{
public final static String EXCEPTION= "EXCEPTION ";
public final static String IGNORED= "IGNORED ";
public final static String IGNORED= "IGNORED EXCEPTION ";
/**
* Logging Configuration Properties

View File

@ -206,7 +206,7 @@ public class LoggerLog extends AbstractLogger
{
if (Log.isIgnored())
{
warn(Log.IGNORED, ignored);
debug(Log.IGNORED, ignored);
}
}

View File

@ -127,7 +127,7 @@ public class Slf4jLog extends AbstractLogger
{
if (Log.isIgnored())
{
warn(Log.IGNORED, ignored);
debug(Log.IGNORED, ignored);
}
}