Skip to content

Commit 0eb0d9b

Browse files
authored
Merge pull request #681 from jooby-project/665
logback.dev.xml not being read fix #665
2 parents 08c255a + c7d8c3a commit 0eb0d9b

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ private static Watcher setupCompiler(final MavenProject project, final String co
306306
private void setLogback() {
307307
// logback
308308
File[] logbackFiles = {localFile("conf", "logback-test.xml"),
309+
localFile("conf", "logback.dev.xml"),
309310
localFile("conf", "logback.xml") };
310311
for (File logback : logbackFiles) {
311312
if (logback.exists()) {

jooby-run/src/main/java/org/jooby/run/Main.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ public void classDefineFailed(final Throwable throwable, final String className,
446446
// set logback
447447
String logback = Optional.ofNullable(System.getProperty("logback.configurationFile"))
448448
.orElseGet(() -> Arrays
449-
.asList(Paths.get("conf", "logback-test.xml"), Paths.get("conf", "logback.xml"))
449+
.asList(Paths.get("conf", "logback-test.xml"), Paths.get("conf", "logback.dev.xml"),
450+
Paths.get("conf", "logback.xml"))
450451
.stream()
451452
.filter(p -> p.toFile().exists())
452453
.map(Path::toString)

0 commit comments

Comments
 (0)