MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Smoosh request logging tasks together rather than having one task for each direction.

This commit is contained in:
Jon Chambers 2021-01-21 13:02:38 -05:00 committed by Jon Chambers
parent f10be893ce
commit 46c800b8b7
4 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -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));

25
service/src/main/java/org/whispersystems/textsecuregcm/workers/DisableRequestLoggingTask.java
View File

@ -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);
}
}

25
service/src/main/java/org/whispersystems/textsecuregcm/workers/EnableRequestLoggingTask.java
View File

@ -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);
}
}

39
service/src/main/java/org/whispersystems/textsecuregcm/workers/SetRequestLoggingEnabledTask.java Normal file
View File

@ -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]");
}
}
}