Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ private static Watcher setupCompiler(final MavenProject project, final String co
private void setLogback() {
// logback
File[] logbackFiles = {localFile("conf", "logback-test.xml"),
localFile("conf", "logback.dev.xml"),
localFile("conf", "logback.xml") };
for (File logback : logbackFiles) {
if (logback.exists()) {
Expand Down
3 changes: 2 additions & 1 deletion jooby-run/src/main/java/org/jooby/run/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ public void classDefineFailed(final Throwable throwable, final String className,
// set logback
String logback = Optional.ofNullable(System.getProperty("logback.configurationFile"))
.orElseGet(() -> Arrays
.asList(Paths.get("conf", "logback-test.xml"), Paths.get("conf", "logback.xml"))
.asList(Paths.get("conf", "logback-test.xml"), Paths.get("conf", "logback.dev.xml"),
Paths.get("conf", "logback.xml"))
.stream()
.filter(p -> p.toFile().exists())
.map(Path::toString)
Expand Down