GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 20:09:26 +01:00
Code Issues Projects Releases Wiki Activity

Make -q and -v do something more sensible

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

Fixes gh-1108
This commit is contained in:
Dave Syer
2014-06-27 16:24:51 +01:00
parent 93c0f6fbc7
commit 54a23f9920
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
+10 -1
View File
@@ -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");
}
}
spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
+6 -2
View File
@@ -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 + "'");
}
}
}