Smoosh request logging tasks together rather than having one task for each direction.
This commit is contained in:
parent
f10be893ce
commit
46c800b8b7
|
@ -146,8 +146,7 @@ import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
|
||||||
import org.whispersystems.textsecuregcm.workers.CertificateCommand;
|
import org.whispersystems.textsecuregcm.workers.CertificateCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.DeleteFeatureFlagTask;
|
import org.whispersystems.textsecuregcm.workers.DeleteFeatureFlagTask;
|
||||||
import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
|
import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.DisableRequestLoggingTask;
|
import org.whispersystems.textsecuregcm.workers.SetRequestLoggingEnabledTask;
|
||||||
import org.whispersystems.textsecuregcm.workers.EnableRequestLoggingTask;
|
|
||||||
import org.whispersystems.textsecuregcm.workers.GetRedisCommandStatsCommand;
|
import org.whispersystems.textsecuregcm.workers.GetRedisCommandStatsCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.GetRedisSlowlogCommand;
|
import org.whispersystems.textsecuregcm.workers.GetRedisSlowlogCommand;
|
||||||
import org.whispersystems.textsecuregcm.workers.ListFeatureFlagsTask;
|
import org.whispersystems.textsecuregcm.workers.ListFeatureFlagsTask;
|
||||||
|
@ -457,8 +456,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
|
||||||
provisioning.addMapping("/v1/websocket/provisioning/");
|
provisioning.addMapping("/v1/websocket/provisioning/");
|
||||||
provisioning.setAsyncSupported(true);
|
provisioning.setAsyncSupported(true);
|
||||||
|
|
||||||
environment.admin().addTask(new EnableRequestLoggingTask());
|
environment.admin().addTask(new SetRequestLoggingEnabledTask());
|
||||||
environment.admin().addTask(new DisableRequestLoggingTask());
|
|
||||||
environment.admin().addTask(new SetCrawlerAccelerationTask(accountDatabaseCrawlerCache));
|
environment.admin().addTask(new SetCrawlerAccelerationTask(accountDatabaseCrawlerCache));
|
||||||
environment.admin().addTask(new ListFeatureFlagsTask(featureFlagsManager));
|
environment.admin().addTask(new ListFeatureFlagsTask(featureFlagsManager));
|
||||||
environment.admin().addTask(new SetFeatureFlagTask(featureFlagsManager));
|
environment.admin().addTask(new SetFeatureFlagTask(featureFlagsManager));
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2013-2020 Signal Messenger, LLC
|
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.whispersystems.textsecuregcm.workers;
|
|
||||||
|
|
||||||
import io.dropwizard.servlets.tasks.Task;
|
|
||||||
import org.whispersystems.textsecuregcm.util.logging.RequestLogManager;
|
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class DisableRequestLoggingTask extends Task {
|
|
||||||
|
|
||||||
public DisableRequestLoggingTask() {
|
|
||||||
super("disable-request-logging");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(final Map<String, List<String>> map, final PrintWriter printWriter) {
|
|
||||||
RequestLogManager.setRequestLoggingEnabled(false);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2013-2020 Signal Messenger, LLC
|
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.whispersystems.textsecuregcm.workers;
|
|
||||||
|
|
||||||
import io.dropwizard.servlets.tasks.Task;
|
|
||||||
import org.whispersystems.textsecuregcm.util.logging.RequestLogManager;
|
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class EnableRequestLoggingTask extends Task {
|
|
||||||
|
|
||||||
public EnableRequestLoggingTask() {
|
|
||||||
super("enable-request-logging");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(final Map<String, List<String>> map, final PrintWriter printWriter) {
|
|
||||||
RequestLogManager.setRequestLoggingEnabled(true);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2013-2020 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.whispersystems.textsecuregcm.workers;
|
||||||
|
|
||||||
|
import io.dropwizard.servlets.tasks.Task;
|
||||||
|
import org.whispersystems.textsecuregcm.util.logging.RequestLogManager;
|
||||||
|
|
||||||
|
import java.io.PrintWriter;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public class SetRequestLoggingEnabledTask extends Task {
|
||||||
|
|
||||||
|
public SetRequestLoggingEnabledTask() {
|
||||||
|
super("set-request-logging-enabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute(final Map<String, List<String>> parameters, final PrintWriter out) {
|
||||||
|
if (parameters.containsKey("enabled") && parameters.get("enabled").size() == 1) {
|
||||||
|
final boolean enabled = Boolean.parseBoolean(parameters.get("enabled").get(0));
|
||||||
|
|
||||||
|
RequestLogManager.setRequestLoggingEnabled(enabled);
|
||||||
|
|
||||||
|
if (enabled) {
|
||||||
|
out.println("Request logging now enabled");
|
||||||
|
} else {
|
||||||
|
out.println("Request logging now disabled");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
out.println("Usage: set-request-logging-enabled?enabled=[true|false]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue