Merge pull request #1471 from ivangsa/features/logbackConfigMain

Check for logback-test.xml file in classpath in Main.class
karatelabs · Feb 4, 2021 · 2617187 · 2617187
2 parents 343487a + deaa44c
commit 2617187
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/karate-core/src/main/java/com/intuit/karate/Main.java b/karate-core/src/main/java/com/intuit/karate/Main.java
@@ -32,6 +32,7 @@
 import com.intuit.karate.http.ServerConfig;
 import com.intuit.karate.http.SslContextFactory;
 import com.intuit.karate.job.JobExecutor;
+import com.intuit.karate.resource.ResourceUtils;
 import com.intuit.karate.shell.Command;
 import java.io.File;
 import java.lang.reflect.Method;
@@ -272,7 +273,15 @@ public static void main(String[] args) {
             // ensure we init logback before anything else
             String logbackConfig = System.getProperty(LOGBACK_CONFIG);
             if (StringUtils.isBlank(logbackConfig)) {
-                System.setProperty(LOGBACK_CONFIG, "logback-fatjar.xml");
+                File logbackXml = ResourceUtils.classPathToFile("logback.xml");
+                File logbackTest = ResourceUtils.classPathToFile("logback-test.xml");
+                if (logbackTest != null) {
+                    System.setProperty(LOGBACK_CONFIG, "logback-test.xml");
+                } else if (logbackXml != null) {
+                    System.setProperty(LOGBACK_CONFIG, "logback.xml");
+                } else {
+                    System.setProperty(LOGBACK_CONFIG, "logback-fatjar.xml");
+                }
             }
         }
         resetLoggerConfig();