aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2018-11-14 22:47:35 +0100
committersonartech <sonartech@sonarsource.com>2019-01-16 09:43:01 +0100
commitf594bf7568192dbfc9b9a8cf4f7c243ea4ad046b (patch)
treeb4d6818199beebf97e5d4d6a10dfcebde10e7ba8 /sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
parenta0acec09a79485117ab9c8e3c67a8446224d5de9 (diff)
downloadsonarqube-f594bf7568192dbfc9b9a8cf4f7c243ea4ad046b.tar.gz
sonarqube-f594bf7568192dbfc9b9a8cf4f7c243ea4ad046b.zip
SONAR-11465 Deprecate InputModule and introduce InputProject
Diffstat (limited to 'sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java')
-rw-r--r--sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
index 08e2236cfec..94c6175298d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
@@ -66,12 +66,7 @@ public final class LoggingConfiguration {
}
public LoggingConfiguration setProperties(Map<String, String> properties) {
- setVerbose(properties, null);
- return this;
- }
-
- public LoggingConfiguration setProperties(Map<String, String> properties, @Nullable Map<String, String> fallback) {
- setVerbose(properties, fallback);
+ setVerbose(properties);
return this;
}
@@ -88,10 +83,10 @@ public final class LoggingConfiguration {
return verbose;
}
- public LoggingConfiguration setVerbose(Map<String, String> props, @Nullable Map<String, String> fallback) {
- String logLevel = getFallback("sonar.log.level", props, fallback);
- String deprecatedProfilingLevel = getFallback("sonar.log.profilingLevel", props, fallback);
- verbose = "true".equals(getFallback("sonar.verbose", props, fallback)) ||
+ public LoggingConfiguration setVerbose(Map<String, String> props) {
+ String logLevel = props.get("sonar.log.level");
+ String deprecatedProfilingLevel = props.get("sonar.log.profilingLevel");
+ verbose = "true".equals(props.get("sonar.verbose")) ||
"DEBUG".equals(logLevel) || "TRACE".equals(logLevel) ||
"BASIC".equals(deprecatedProfilingLevel) || "FULL".equals(deprecatedProfilingLevel);