From 46c800b8b75612e689f13b40a82ed76ef35e3a27 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 21 Jan 2021 13:02:38 -0500
Subject: [PATCH] Smoosh request logging tasks together rather than having one
 task for each direction.

---
 .../textsecuregcm/WhisperServerService.java   |  6 +--
 .../workers/DisableRequestLoggingTask.java    | 25 ------------
 .../workers/EnableRequestLoggingTask.java     | 25 ------------
 .../workers/SetRequestLoggingEnabledTask.java | 39 +++++++++++++++++++
 4 files changed, 41 insertions(+), 54 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/workers/DisableRequestLoggingTask.java
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/workers/EnableRequestLoggingTask.java
 create mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/workers/SetRequestLoggingEnabledTask.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index d13a8c791..d264e3cae 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -146,8 +146,7 @@ import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
 import org.whispersystems.textsecuregcm.workers.CertificateCommand;
 import org.whispersystems.textsecuregcm.workers.DeleteFeatureFlagTask;
 import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
-import org.whispersystems.textsecuregcm.workers.DisableRequestLoggingTask;
-import org.whispersystems.textsecuregcm.workers.EnableRequestLoggingTask;
+import org.whispersystems.textsecuregcm.workers.SetRequestLoggingEnabledTask;
 import org.whispersystems.textsecuregcm.workers.GetRedisCommandStatsCommand;
 import org.whispersystems.textsecuregcm.workers.GetRedisSlowlogCommand;
 import org.whispersystems.textsecuregcm.workers.ListFeatureFlagsTask;
@@ -457,8 +456,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     provisioning.addMapping("/v1/websocket/provisioning/");
     provisioning.setAsyncSupported(true);
 
-    environment.admin().addTask(new EnableRequestLoggingTask());
-    environment.admin().addTask(new DisableRequestLoggingTask());
+    environment.admin().addTask(new SetRequestLoggingEnabledTask());
     environment.admin().addTask(new SetCrawlerAccelerationTask(accountDatabaseCrawlerCache));
     environment.admin().addTask(new ListFeatureFlagsTask(featureFlagsManager));
     environment.admin().addTask(new SetFeatureFlagTask(featureFlagsManager));
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/DisableRequestLoggingTask.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/DisableRequestLoggingTask.java
deleted file mode 100644
index c6a84d251..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/DisableRequestLoggingTask.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/EnableRequestLoggingTask.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/EnableRequestLoggingTask.java
deleted file mode 100644
index 5cf22f7f8..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/EnableRequestLoggingTask.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetRequestLoggingEnabledTask.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetRequestLoggingEnabledTask.java
new file mode 100644
index 000000000..b038c59d5
--- /dev/null
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/SetRequestLoggingEnabledTask.java
@@ -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]");
+        }
+    }
+}