root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "@ExceptionHandler methods logs at DEBUG level again" 

This reverts commit 162112.

Instead we'll go for a bigger rollback of the change from SPR-17178 so
that only DefaultHandlerExceptionResolver does warn logging by default.

Issue: SPR-17388
This commit is contained in:
Rossen Stoyanchev 2018-10-22 11:46:02 -04:00
parent 0176d362be
commit de453ace86
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
View File

@ -135,18 +135,11 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
prepareResponse(ex, response); prepareResponse(ex, response);
ModelAndView result = doResolveException(request, response, handler, ex); ModelAndView result = doResolveException(request, response, handler, ex);
if (result != null) { if (result != null) {
// Print warn or debug message when warn logger is not enabled... // Print warn message when warn logger is not enabled...
if (this.warnLogger == null || !this.warnLogger.isWarnEnabled()) { if (logger.isWarnEnabled() && (this.warnLogger == null || !this.warnLogger.isWarnEnabled())) {
if (!useWarnLevelWhenWarnLoggerNotEnabled()) {
if (logger.isDebugEnabled()) {
logger.debug("Resolved [" + ex + "]" + (result.isEmpty() ? "" : " to " + result));
}
}
else if (logger.isWarnEnabled()) {
logger.warn("Resolved [" + ex + "]" + (result.isEmpty() ? "" : " to " + result)); logger.warn("Resolved [" + ex + "]" + (result.isEmpty() ? "" : " to " + result));
} }
} // warnLogger with full stack trace (requires explicit config)
// Log with warnLogger (requires explicit config)
logException(ex, request); logException(ex, request);
} }
return result; return result;
@ -186,16 +179,6 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
return (this.mappedHandlers == null && this.mappedHandlerClasses == null); return (this.mappedHandlers == null && this.mappedHandlerClasses == null);
} }
/**
* Whether to log warn level messages (return value "true") or debug level
* messages (return value "false") through the regular class logger when
* {@link #setWarnLogCategory warn logging} is not activated.
* <p>By default returns "true".
*/
protected boolean useWarnLevelWhenWarnLoggerNotEnabled() {
return true;
}
/** /**
* Log the given exception at warn level, provided that warn logging has been * Log the given exception at warn level, provided that warn logging has been
* activated through the {@link #setWarnLogCategory "warnLogCategory"} property. * activated through the {@link #setWarnLogCategory "warnLogCategory"} property.

6
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
View File

@ -491,10 +491,4 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
return null; return null;
} }
@Override
protected boolean useWarnLevelWhenWarnLoggerNotEnabled() {
// Use DEBUG level
return false;
}
} }