From 6fd1c841265db1bc4ddcdbe5eae2c59f7cbd3ce0 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 4 Oct 2023 16:42:04 -0400 Subject: [PATCH] Make command namespace available to subclasses --- .../AbstractSinglePassCrawlAccountsCommand.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AbstractSinglePassCrawlAccountsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AbstractSinglePassCrawlAccountsCommand.java index 539efe54d..0606de558 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/AbstractSinglePassCrawlAccountsCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/AbstractSinglePassCrawlAccountsCommand.java @@ -24,6 +24,7 @@ import reactor.core.scheduler.Schedulers; public abstract class AbstractSinglePassCrawlAccountsCommand extends EnvironmentCommand { private CommandDependencies commandDependencies; + private Namespace namespace; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -53,14 +54,19 @@ public abstract class AbstractSinglePassCrawlAccountsCommand extends Environment return commandDependencies; } + protected Namespace getNamespace() { + return namespace; + } + @Override protected void run(final Environment environment, final Namespace namespace, final WhisperServerConfiguration configuration) throws Exception { UncaughtExceptionHandler.register(); - MetricsUtil.configureRegistries(configuration, environment); - commandDependencies = CommandDependencies.build(getName(), environment, configuration); + + this.namespace = namespace; + this.commandDependencies = CommandDependencies.build(getName(), environment, configuration); final int segments = Objects.requireNonNull(namespace.getInt(SEGMENT_COUNT)); @@ -75,7 +81,6 @@ public abstract class AbstractSinglePassCrawlAccountsCommand extends Environment } finally { commandStopListener.stop(); } - } @Override