From 9266004cc36f5aaa79241cad835be72f1371f4e2 Mon Sep 17 00:00:00 2001
From: Dave Brosius <dbrosius@mebigfatguy.com>
Date: Mon, 23 May 2016 19:36:56 -0400
Subject: [PATCH] fix logging contexts

---
 .../HystrixCodaHaleMetricsPublisherThreadPool.java           | 2 +-
 .../contrib/javanica/command/BatchHystrixCommand.java        | 2 +-
 .../java/com/netflix/hystrix/collapser/RequestBatch.java     | 5 ++---
 .../java/com/netflix/hystrix/collapser/RequestCollapser.java | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hystrix-contrib/hystrix-codahale-metrics-publisher/src/main/java/com/netflix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherThreadPool.java b/hystrix-contrib/hystrix-codahale-metrics-publisher/src/main/java/com/netflix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherThreadPool.java
index 182822614..2021a8e33 100644
--- a/hystrix-contrib/hystrix-codahale-metrics-publisher/src/main/java/com/netflix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherThreadPool.java
+++ b/hystrix-contrib/hystrix-codahale-metrics-publisher/src/main/java/com/netflix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherThreadPool.java
@@ -36,7 +36,7 @@ public class HystrixCodaHaleMetricsPublisherThreadPool implements HystrixMetrics
     private final String metricGroup;
     private final String metricType;
 
-    static final Logger logger = LoggerFactory.getLogger(HystrixCodaHaleMetricsPublisherCollapser.class);
+    static final Logger logger = LoggerFactory.getLogger(HystrixCodaHaleMetricsPublisherThreadPool.class);
 
     public HystrixCodaHaleMetricsPublisherThreadPool(HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolMetrics metrics, HystrixThreadPoolProperties properties, MetricRegistry metricRegistry) {
         this.key = threadPoolKey;
diff --git a/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java b/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java
index ac6217f63..d552a4738 100644
--- a/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java
+++ b/hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java
@@ -34,7 +34,7 @@
 @ThreadSafe
 public class BatchHystrixCommand extends AbstractHystrixCommand<List<Object>> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenericCommand.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BatchHystrixCommand.class);
 
     public BatchHystrixCommand(HystrixCommandBuilder builder) {
         super(builder);
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java
index 85582827b..12d5748e9 100644
--- a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java
+++ b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java
@@ -28,7 +28,6 @@
 import rx.functions.Action0;
 import rx.functions.Action1;
 
-import com.netflix.hystrix.HystrixCollapser;
 import com.netflix.hystrix.HystrixCollapser.CollapsedRequest;
 import com.netflix.hystrix.HystrixCollapserProperties;
 
@@ -41,7 +40,7 @@
  */
 public class RequestBatch<BatchReturnType, ResponseType, RequestArgumentType> {
 
-    private static final Logger logger = LoggerFactory.getLogger(HystrixCollapser.class);
+    private static final Logger logger = LoggerFactory.getLogger(RequestBatch.class);
 
     private final HystrixCollapserBridge<BatchReturnType, ResponseType, RequestArgumentType> commandCollapser;
     private final int maxBatchSize;
@@ -273,4 +272,4 @@ public void shutdown() {
     public int getSize() {
         return count.get();
     }
-}
\ No newline at end of file
+}
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapser.java b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapser.java
index f77c02c47..9c0181573 100644
--- a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapser.java
+++ b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapser.java
@@ -25,7 +25,6 @@
 
 import rx.Observable;
 
-import com.netflix.hystrix.HystrixCollapser;
 import com.netflix.hystrix.HystrixCollapserProperties;
 import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
 import com.netflix.hystrix.strategy.concurrency.HystrixContextCallable;
@@ -41,7 +40,7 @@
  * @ThreadSafe
  */
 public class RequestCollapser<BatchReturnType, ResponseType, RequestArgumentType> {
-    static final Logger logger = LoggerFactory.getLogger(HystrixCollapser.class);
+    static final Logger logger = LoggerFactory.getLogger(RequestCollapser.class);
 
     private final HystrixCollapserBridge<BatchReturnType, ResponseType, RequestArgumentType> commandCollapser;
     // batch can be null once shutdown
@@ -178,4 +177,4 @@ public int getIntervalTimeInMilliseconds() {
 
     }
 
-}
\ No newline at end of file
+}