From 11564671da764c89a6e2246974c45f3bbbd9a316 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 1 Dec 2016 10:02:23 +0100 Subject: [PATCH] SONAR-8335 rename LogDomain#ES_CLIENT to LogDomain#ES --- .../main/java/org/sonar/process/logging/LogDomain.java | 2 +- .../java/org/sonar/process/logging/LogbackHelperTest.java | 8 ++++---- .../src/main/java/org/sonar/ce/log/CeProcessLogging.java | 2 +- .../org/sonar/server/app/WebServerProcessLogging.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/sonar-process/src/main/java/org/sonar/process/logging/LogDomain.java b/server/sonar-process/src/main/java/org/sonar/process/logging/LogDomain.java index a4a19a64ca7..5a4198363b8 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/logging/LogDomain.java +++ b/server/sonar-process/src/main/java/org/sonar/process/logging/LogDomain.java @@ -21,7 +21,7 @@ package org.sonar.process.logging; public enum LogDomain { SQL("sql"), - ES_CLIENT("es"), + ES("es"), JMX("jmx"); private final String key; diff --git a/server/sonar-process/src/test/java/org/sonar/process/logging/LogbackHelperTest.java b/server/sonar-process/src/test/java/org/sonar/process/logging/LogbackHelperTest.java index 023d8494875..66d9912de1e 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/logging/LogbackHelperTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/logging/LogbackHelperTest.java @@ -240,7 +240,7 @@ public class LogbackHelperTest { @Test public void apply_sets_domain_property_over_process_and_global_property_if_all_set() { - LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES_CLIENT).build(); + LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES).build(); props.set("sonar.log.level", "DEBUG"); props.set("sonar.log.level.web", "DEBUG"); props.set("sonar.log.level.web.es", "TRACE"); @@ -252,7 +252,7 @@ public class LogbackHelperTest { @Test public void apply_sets_domain_property_over_process_property_if_both_set() { - LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES_CLIENT).build(); + LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES).build(); props.set("sonar.log.level.web", "DEBUG"); props.set("sonar.log.level.web.es", "TRACE"); @@ -263,7 +263,7 @@ public class LogbackHelperTest { @Test public void apply_sets_domain_property_over_global_property_if_both_set() { - LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES_CLIENT).build(); + LogLevelConfig config = LogLevelConfig.newBuilder().levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.ES).build(); props.set("sonar.log.level", "DEBUG"); props.set("sonar.log.level.web.es", "TRACE"); @@ -299,7 +299,7 @@ public class LogbackHelperTest { LogLevelConfig config = LogLevelConfig.newBuilder() .rootLevelFor(ProcessId.WEB_SERVER) .levelByDomain("foo", ProcessId.WEB_SERVER, LogDomain.JMX) - .levelByDomain("bar", ProcessId.COMPUTE_ENGINE, LogDomain.ES_CLIENT) + .levelByDomain("bar", ProcessId.COMPUTE_ENGINE, LogDomain.ES) .immutableLevel("doh", Level.ERROR) .immutableLevel("pif", Level.TRACE) .build(); diff --git a/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java b/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java index 52a385de58f..5729b41fa5b 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java @@ -38,7 +38,7 @@ public class CeProcessLogging extends ServerProcessLogging { @Override protected void extendLogLevelConfiguration(LogLevelConfig.Builder logLevelConfigBuilder) { logLevelConfigBuilder.levelByDomain("sql", ProcessId.COMPUTE_ENGINE, LogDomain.SQL); - logLevelConfigBuilder.levelByDomain("es", ProcessId.COMPUTE_ENGINE, LogDomain.ES_CLIENT); + logLevelConfigBuilder.levelByDomain("es", ProcessId.COMPUTE_ENGINE, LogDomain.ES); JMX_RMI_LOGGER_NAMES.forEach(loggerName -> logLevelConfigBuilder.levelByDomain(loggerName, ProcessId.COMPUTE_ENGINE, LogDomain.JMX)); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java b/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java index da2a4f6ad48..149d94be91a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java +++ b/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java @@ -39,7 +39,7 @@ public class WebServerProcessLogging extends ServerProcessLogging { @Override protected void extendLogLevelConfiguration(LogLevelConfig.Builder logLevelConfigBuilder) { logLevelConfigBuilder.levelByDomain("sql", ProcessId.WEB_SERVER, LogDomain.SQL); - logLevelConfigBuilder.levelByDomain("es", ProcessId.WEB_SERVER, LogDomain.ES_CLIENT); + logLevelConfigBuilder.levelByDomain("es", ProcessId.WEB_SERVER, LogDomain.ES); JMX_RMI_LOGGER_NAMES.forEach(loggerName -> logLevelConfigBuilder.levelByDomain(loggerName, ProcessId.WEB_SERVER, LogDomain.JMX)); } -- 2.39.5