diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-12-01 10:02:23 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-12-01 12:29:40 +0100 |
| commit | 11564671da764c89a6e2246974c45f3bbbd9a316 (patch) | |
| tree | ed7f949bdd1849d709cca0a55cc33da8234dacd0 /server/sonar-process/src | |
| parent | 82e3d57cf327c5bb8843bd54492bca884614d325 (diff) | |
| download | sonarqube-11564671da764c89a6e2246974c45f3bbbd9a316.tar.gz sonarqube-11564671da764c89a6e2246974c45f3bbbd9a316.zip | |
SONAR-8335 rename LogDomain#ES_CLIENT to LogDomain#ES
Diffstat (limited to 'server/sonar-process/src')
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/logging/LogDomain.java | 2 | ||||
| -rw-r--r-- | server/sonar-process/src/test/java/org/sonar/process/logging/LogbackHelperTest.java | 8 |
2 files changed, 5 insertions, 5 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(); |