SONAR-9802 allow to change the log level of a cluster

2 files changed, 11 insertions, 26 deletions

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java b/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java
index 3e47ea2a962..aa67614d588 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java
@@ -23,8 +23,6 @@ import fi.iki.elonen.NanoHTTPD;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.ce.httpd.HttpAction;
-import org.sonar.ce.log.CeProcessLogging;
-import org.sonar.db.Database;
 import org.sonar.server.platform.ServerLogging;
 
 import static fi.iki.elonen.NanoHTTPD.MIME_PLAINTEXT;
@@ -40,13 +38,9 @@ public class ChangeLogLevelHttpAction implements HttpAction {
   private static final String PARAM_LEVEL = "level";
 
   private final ServerLogging logging;
-  private final Database db;
-  private final CeProcessLogging ceProcessLogging;
 
-  public ChangeLogLevelHttpAction(ServerLogging logging, Database db, CeProcessLogging ceProcessLogging) {
+  public ChangeLogLevelHttpAction(ServerLogging logging) {
     this.logging = logging;
-    this.db = db;
-    this.ceProcessLogging = ceProcessLogging;
   }
 
   @Override
@@ -66,8 +60,7 @@ public class ChangeLogLevelHttpAction implements HttpAction {
     }
     try {
       LoggerLevel level = LoggerLevel.valueOf(levelStr);
-      db.enableSqlLogging(level.equals(LoggerLevel.TRACE));
-      logging.changeLevel(ceProcessLogging, level);
+      logging.changeLevel(level);
       return newFixedLengthResponse(OK, MIME_PLAINTEXT, null);
     } catch (IllegalArgumentException e) {
       Loggers.get(ChangeLogLevelHttpAction.class).debug("Value '{}' for parameter '{}' is invalid", levelStr, PARAM_LEVEL, e);
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java
index 88435a2a8ba..40a1a5ce66f 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java
@@ -26,8 +26,6 @@ import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.ce.httpd.HttpAction;
-import org.sonar.ce.log.CeProcessLogging;
-import org.sonar.db.Database;
 import org.sonar.server.platform.ServerLogging;
 
 import static fi.iki.elonen.NanoHTTPD.Method.GET;
@@ -42,9 +40,7 @@ import static org.sonar.ce.httpd.CeHttpUtils.createHttpSession;
 
 public class ChangeLogLevelHttpActionTest {
   private ServerLogging serverLogging = mock(ServerLogging.class);
-  private Database database = mock(Database.class);
-  private CeProcessLogging ceProcessLogging = new CeProcessLogging();
-  private ChangeLogLevelHttpAction underTest = new ChangeLogLevelHttpAction(serverLogging, database, ceProcessLogging);
+  private ChangeLogLevelHttpAction underTest = new ChangeLogLevelHttpAction(serverLogging);
 
   @Test
   public void register_to_path_changeLogLevel() {
@@ -78,42 +74,38 @@ public class ChangeLogLevelHttpActionTest {
   }
 
   @Test
-  public void changes_server_logging_and_disabled_database_logging_if_level_is_ERROR() {
+  public void changes_server_logging_if_level_is_ERROR() {
     NanoHTTPD.Response response = underTest.serve(createHttpSession(POST, ImmutableMap.of("level", "ERROR")));
 
     assertThat(response.getStatus()).isEqualTo(OK);
 
-    verify(serverLogging).changeLevel(ceProcessLogging, LoggerLevel.ERROR);
-    verify(database).enableSqlLogging(false);
+    verify(serverLogging).changeLevel(LoggerLevel.ERROR);
   }
 
   @Test
-  public void changes_server_logging_and_disabled_database_logging_if_level_is_INFO() {
+  public void changes_server_logging_if_level_is_INFO() {
     NanoHTTPD.Response response = underTest.serve(createHttpSession(POST, ImmutableMap.of("level", "INFO")));
 
     assertThat(response.getStatus()).isEqualTo(OK);
 
-    verify(serverLogging).changeLevel(ceProcessLogging, LoggerLevel.INFO);
-    verify(database).enableSqlLogging(false);
+    verify(serverLogging).changeLevel(LoggerLevel.INFO);
   }
 
   @Test
-  public void changes_server_logging_and_disabled_database_logging_if_level_is_DEBUG() {
+  public void changes_server_logging_if_level_is_DEBUG() {
     NanoHTTPD.Response response = underTest.serve(createHttpSession(POST, ImmutableMap.of("level", "DEBUG")));
 
     assertThat(response.getStatus()).isEqualTo(OK);
 
-    verify(serverLogging).changeLevel(ceProcessLogging, LoggerLevel.DEBUG);
-    verify(database).enableSqlLogging(false);
+    verify(serverLogging).changeLevel(LoggerLevel.DEBUG);
   }
 
   @Test
-  public void changes_server_logging_and_enable_database_logging_if_level_is_TRACE() {
+  public void changes_server_logging_if_level_is_TRACE() {
     NanoHTTPD.Response response = underTest.serve(createHttpSession(POST, ImmutableMap.of("level", "TRACE")));
 
     assertThat(response.getStatus()).isEqualTo(OK);
 
-    verify(serverLogging).changeLevel(ceProcessLogging, LoggerLevel.TRACE);
-    verify(database).enableSqlLogging(true);
+    verify(serverLogging).changeLevel(LoggerLevel.TRACE);
   }
 }