Merge pull request Netflix#137 from ghenkes/logging-fix

Report ZuulExceptions through logger in ZuulServletFilter
sanjeevgour · Aug 26, 2015 · 74060d2 · 74060d2
2 parents fd0a0f6 + db2fbec
commit 74060d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/ZuulServletFilter.java b/zuul-core/src/main/java/com/netflix/zuul/filters/ZuulServletFilter.java
@@ -109,7 +109,6 @@ void init(HttpServletRequest servletRequest, HttpServletResponse servletResponse
     void error(ZuulException e) {
         RequestContext.getCurrentContext().setThrowable(e);
         zuulRunner.error();
-        e.printStackTrace();
     }
 
     public void destroy() {

diff --git a/zuul-core/src/main/java/com/netflix/zuul/http/ZuulServlet.java b/zuul-core/src/main/java/com/netflix/zuul/http/ZuulServlet.java
@@ -25,8 +25,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -47,10 +45,9 @@
  *         Time: 10:44 AM
  */
 public class ZuulServlet extends HttpServlet {
-    
+
     private static final long serialVersionUID = -3374242278843351500L;
     private ZuulRunner zuulRunner;
-    private static Logger LOG = LoggerFactory.getLogger(ZuulServlet.class);
 
 
     @Override
@@ -146,7 +143,6 @@ void init(HttpServletRequest servletRequest, HttpServletResponse servletResponse
     void error(ZuulException e) {
         RequestContext.getCurrentContext().setThrowable(e);
         zuulRunner.error();
-        LOG.error(e.getMessage(), e);
     }
 
     @RunWith(MockitoJUnitRunner.class)
@@ -196,7 +192,7 @@ public void testProcessZuulFilter() {
                 RequestContext.testSetCurrentContext(null);
 
             } catch (Exception e) {
-                LOG.error(e.getMessage(), e);
+                e.printStackTrace();
             }
 
 

diff --git a/zuul-netflix-webapp/src/main/groovy/filters/pre/ErrorResponse.groovy b/zuul-netflix-webapp/src/main/groovy/filters/pre/ErrorResponse.groovy
@@ -26,12 +26,16 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.runners.MockitoJUnitRunner
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 
 class ErrorResponse extends ZuulFilter {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ErrorResponse.class);
+
     @Override
     String filterType() {
         return 'error'
@@ -53,6 +57,7 @@ class ErrorResponse extends ZuulFilter {
         RequestContext context = RequestContext.currentContext
         Throwable ex = context.getThrowable()
         try {
+            LOG.error(ex.getMessage(), ex);
             throw ex
         } catch (ZuulException e) {
             String cause = e.errorCause