SONAR-8335 support properties to configure log level per JVM

2 files changed, 5 insertions, 4 deletions

diff --git a/sonar-application/src/main/java/org/sonar/application/AppLogging.java b/sonar-application/src/main/java/org/sonar/application/AppLogging.java
index 7ec122f95ce..6a5586b9381 100644
--- a/sonar-application/src/main/java/org/sonar/application/AppLogging.java
+++ b/sonar-application/src/main/java/org/sonar/application/AppLogging.java
@@ -25,6 +25,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.FileAppender;
 import org.sonar.process.LogbackHelper;
+import org.sonar.process.ProcessId;
 import org.sonar.process.Props;
 
 import static org.slf4j.Logger.ROOT_LOGGER_NAME;
@@ -126,7 +127,7 @@ class AppLogging {
     } else {
       configureWithWrapperWritingToFile(ctx);
     }
-    helper.configureRootLogLevel(props, "sonar.app.log.level");
+    helper.configureRootLogLevel(props, ProcessId.APP);
 
     return ctx;
   }
diff --git a/sonar-application/src/test/java/org/sonar/application/AppLoggingTest.java b/sonar-application/src/test/java/org/sonar/application/AppLoggingTest.java
index 0fccc6e11c7..d53a868482b 100644
--- a/sonar-application/src/test/java/org/sonar/application/AppLoggingTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/AppLoggingTest.java
@@ -178,7 +178,7 @@ public class AppLoggingTest {
 
   @Test
   public void root_logger_level_can_be_changed_with_a_property() {
-    props.set("sonar.app.log.level", "TRACE");
+    props.set("sonar.log.level.app", "TRACE");
 
     LoggerContext ctx = underTest.configure(props);
     Logger rootLogger = ctx.getLogger(ROOT_LOGGER_NAME);
@@ -187,7 +187,7 @@ public class AppLoggingTest {
 
   @Test
   public void property_changing_root_logger_level_is_case_insensitive() {
-    props.set("sonar.app.log.level", "trace");
+    props.set("sonar.log.level.app", "trace");
 
     LoggerContext ctx = underTest.configure(props);
     Logger rootLogger = ctx.getLogger(ROOT_LOGGER_NAME);
@@ -196,7 +196,7 @@ public class AppLoggingTest {
 
   @Test
   public void default_to_INFO_if_property_changing_root_logger_level_has_invalid_value() {
-    props.set("sonar.app.log.level", "DodoDouh!");
+    props.set("sonar.log.level.app", "DodoDouh!");
 
     LoggerContext ctx = underTest.configure(props);
     Logger rootLogger = ctx.getLogger(ROOT_LOGGER_NAME);