Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix logging contexts #1212

Merged
merged 1 commit into from
May 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -273,4 +272,4 @@ public void shutdown() {
public int getSize() {
return count.get();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -178,4 +177,4 @@ public int getIntervalTimeInMilliseconds() {

}

}
}