From 1e958a7e7911e65bbef555c65ae738bb75d7f1d6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 29 Oct 2020 10:55:43 -0500 Subject: [PATCH] simplify logger naming for core systems --- .../engine/api/activityimpl/SimpleActivity.java | 2 +- .../nosqlbench/engine/core/metrics/MetricReporters.java | 8 ++++---- .../java/io/nosqlbench/engine/core/script/Scenario.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index de0d82610..9eed87e0e 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -35,7 +35,7 @@ import java.util.function.Supplier; * A default implementation of an Activity, suitable for building upon. */ public class SimpleActivity implements Activity, ProgressCapable { - private final static Logger logger = LoggerFactory.getLogger(SimpleActivity.class); + private final static Logger logger = LoggerFactory.getLogger("ACTIVITY"); protected ActivityDef activityDef; private final List closeables = new ArrayList<>(); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java index 27346ef9b..8574f6edb 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricReporters.java @@ -35,10 +35,10 @@ import java.util.concurrent.TimeUnit; public class MetricReporters implements Shutdownable { private final static Logger logger = LoggerFactory.getLogger(MetricReporters.class); - private static MetricReporters instance = new MetricReporters(); + private static final MetricReporters instance = new MetricReporters(); - private List metricRegistries = new ArrayList<>(); - private List scheduledReporters = new ArrayList<>(); + private final List metricRegistries = new ArrayList<>(); + private final List scheduledReporters = new ArrayList<>(); private MetricReporters() { ShutdownManager.register(this); @@ -136,7 +136,7 @@ public class MetricReporters implements Shutdownable { public MetricReporters start(int consoleIntervalSeconds, int remoteIntervalSeconds) { for (ScheduledReporter scheduledReporter : scheduledReporters) { - logger.info("starting reporter: " + scheduledReporter); + logger.info("starting reporter: " + scheduledReporter.getClass().getSimpleName()); if (scheduledReporter instanceof ConsoleReporter) { scheduledReporter.start(consoleIntervalSeconds, TimeUnit.SECONDS); } else { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 3b0360f16..3c8a49e1e 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -46,7 +46,7 @@ import java.util.stream.Collectors; public class Scenario implements Callable { - private static final Logger logger = (Logger) LoggerFactory.getLogger(Scenario.class); + private static final Logger logger = (Logger) LoggerFactory.getLogger("SCENARIO"); private State state = State.Scheduled;