Merge pull request Netflix#253 from BGehrels/master

Handling InterruptedExceptions in the HystrixMetricsStreamServlet
tj1898 · May 5, 2014 · 2d14613 · 2d14613
2 parents d815db9 + e6d8cd6
commit 2d14613
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java b/...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java
@@ -150,6 +150,10 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo
                         // now wait the 'delay' time
                         Thread.sleep(delay);
                     }
+                } catch (InterruptedException e) {
+                    poller.shutdown();
+                    logger.debug("InterruptedException. Will stop polling.");	
+                    Thread.currentThread().interrupt();
                 } catch (IOException e) {
                     poller.shutdown();
                     // debug instead of error as we expect to get these whenever a client disconnects or network issue occurs