Merge pull request #1212 from mebigfatguy/master

fix logging contexts
Netflix · May 23, 2016 · bca8d89 · bca8d89
2 parents bf56d90 + 9266004
commit bca8d89
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/...x/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherThreadPool.java b/...x/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/...anica/src/main/java/com/netflix/hystrix/contrib/javanica/command/BatchHystrixCommand.java b/...anica/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
@@ -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();
     }
-}
+}
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
@@ -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() {
 
     }
 
-}
+}