Browse Source

Make -q and -v do something more sensible

-q switches off all logging and the banner, -v switches logging to debug,
running with neither will be info.

Fixes gh-1108
pull/1183/head
Dave Syer 12 years ago
parent
commit
54a23f9920
  1. 11
      spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
  2. 8
      spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

11
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java

@ -67,8 +67,17 @@ public class SpringApplicationRunner { @@ -67,8 +67,17 @@ public class SpringApplicationRunner {
this.sources = sources.clone();
this.args = args.clone();
this.compiler = new GroovyCompiler(configuration);
if (configuration.getLogLevel().intValue() <= Level.FINE.intValue()) {
int level = configuration.getLogLevel().intValue();
if (level <= Level.FINER.intValue()) {
System.setProperty("groovy.grape.report.downloads", "true");
System.setProperty("trace", "true");
}
else if (level <= Level.FINE.intValue()) {
System.setProperty("debug", "true");
}
else if (level == Level.OFF.intValue()) {
System.setProperty("spring.main.showBanner", "false");
System.setProperty("logging.level.ROOT", "OFF");
}
}

8
spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

@ -206,13 +206,17 @@ public class LoggingApplicationListener implements SmartApplicationListener { @@ -206,13 +206,17 @@ public class LoggingApplicationListener implements SmartApplicationListener {
Map<String, Object> levels = new RelaxedPropertyResolver(environment)
.getSubProperties("logging.level.");
for (Entry<String, Object> entry : levels.entrySet()) {
String name = entry.getKey();
try {
LogLevel level = LogLevel.valueOf(entry.getValue().toString());
system.setLogLevel(entry.getKey(), level);
if (name.equalsIgnoreCase("root")) {
name = null;
}
system.setLogLevel(name, level);
}
catch (RuntimeException e) {
this.logger.error("Cannot set level: " + entry.getValue() + " for '"
+ entry.getKey() + "'");
+ name + "'");
}
}
}

Loading…
Cancel
Save