github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10463] Configuration log level is ignored by GenerationTool for first log statements

Browse Source
This commit is contained in:
Lukas Eder 2020-08-05 11:24:11 +02:00
parent 4e06508d90
commit da51a12265
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
View File

@ -189,8 +189,11 @@ public class GenerationTool {
return;
}
// [#10463] Make sure logging threshold is set, in this special case
Configuration configuration = load(in);
setGlobalLoggingThreshold(configuration);
log.info("Initialising properties", file);
generate(load(in));
generate(configuration);
}
catch (Exception e) {
log.error("Cannot read " + file + ". Error : " + e.getMessage(), e);
@ -244,32 +247,8 @@ public class GenerationTool {
@SuppressWarnings("unchecked")
private void run0(Configuration configuration) throws Exception {
if (Boolean.getBoolean("jooq.codegen.skip")) {
log.info("Skipping jOOQ code generation");
return;
}
if (configuration.getLogging() != null) {
switch (configuration.getLogging()) {
case TRACE:
JooqLogger.globalThreshold(Level.TRACE);
break;
case DEBUG:
JooqLogger.globalThreshold(Level.DEBUG);
break;
case INFO:
JooqLogger.globalThreshold(Level.INFO);
break;
case WARN:
JooqLogger.globalThreshold(Level.WARN);
break;
case ERROR:
JooqLogger.globalThreshold(Level.ERROR);
break;
case FATAL:
JooqLogger.globalThreshold(Level.FATAL);
break;
}
setGlobalLoggingThreshold(configuration);
}
else {
String property = System.getProperty("jooq.codegen.logging");
@ -284,6 +263,11 @@ public class GenerationTool {
}
}
if (Boolean.getBoolean("jooq.codegen.skip")) {
log.info("Skipping jOOQ code generation");
return;
}
if (log.isDebugEnabled())
log.debug("Input configuration", "" + configuration);
@ -909,6 +893,31 @@ public class GenerationTool {
}
}
private static void setGlobalLoggingThreshold(Configuration configuration) {
if (configuration.getLogging() != null) {
switch (configuration.getLogging()) {
case TRACE:
JooqLogger.globalThreshold(Level.TRACE);
break;
case DEBUG:
JooqLogger.globalThreshold(Level.DEBUG);
break;
case INFO:
JooqLogger.globalThreshold(Level.INFO);
break;
case WARN:
JooqLogger.globalThreshold(Level.WARN);
break;
case ERROR:
JooqLogger.globalThreshold(Level.ERROR);
break;
case FATAL:
JooqLogger.globalThreshold(Level.FATAL);
break;
}
}
}
private Properties properties(List<Property> properties) {
Properties result = new Properties();