Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleanup for fix for GRAILS-9061

  • Loading branch information...
commit aab239be69cfc5e0405012459ea884bdbe92c090 1 parent 59307b6
@lhotari lhotari authored
View
4 grails-core/src/main/groovy/org/codehaus/groovy/grails/exceptions/DefaultStackTraceFilterer.java
@@ -31,8 +31,8 @@
* @author Graeme Rocher
*/
public class DefaultStackTraceFilterer implements StackTraceFilterer {
-
- public static final Log STACK_LOG = LogFactory.getLog("StackTrace");
+ public static final String STACK_LOG_NAME = "StackTrace";
+ public static final Log STACK_LOG = LogFactory.getLog(STACK_LOG_NAME);
private static final String[] DEFAULT_INTERNAL_PACKAGES = new String[] {
"org.grails.plugin.resource.DevMode",
View
3  grails-plugin-log4j/src/main/groovy/org/slf4j/impl/GrailsLog4jLoggerAdapter.java
@@ -24,7 +24,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.codehaus.groovy.grails.exceptions.DefaultStackTraceFilterer;
-import org.codehaus.groovy.grails.exceptions.StackTraceFilterer;
import org.slf4j.helpers.FormattingTuple;
import org.slf4j.helpers.MarkerIgnoringBase;
import org.slf4j.helpers.MessageFormatter;
@@ -188,7 +187,7 @@ private final void logMessageFormat(final Level level, final String format, fina
}
private final void logMessage(final Level level, final String msg, final Throwable t) {
- Throwable filteredTrace = (t != null && log4jLogger.isEnabledFor(level) && !("StackTrace".equals(name) || (msg != null && msg.startsWith(StackTraceFilterer.FULL_STACK_TRACE_MESSAGE)))) ? cleanIfException(t) : t;
+ Throwable filteredTrace = (t != null && log4jLogger.isEnabledFor(level) && !DefaultStackTraceFilterer.STACK_LOG_NAME.equals(name)) ? cleanIfException(t) : t;
log4jLogger.log(FQCN, level, msg, filteredTrace);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.