fix(server): properly implement logback loading from PWD

Author: xeruf

server/src/main/java/sc/server/Application.java

@@ -12,17 +12,13 @@
 
 public final class Application {
 
-  private static final Logger logger = LoggerFactory.getLogger(Application.class);
-  private static final Object SYNCOBJ = new Object();
-
   static {
-    String config = System.getProperty("logback.configurationFile");
-    logger.debug("Loading logback config from {}", config != null ? config : System.getProperty("user.dir") + File.separator + "logback.xml");
-    if (config == null)
-      System.setProperty("logback.configurationFile", System.getProperty("user.dir") + File.separator + "logback.xml");
-    System.setProperty("file.encoding", "UTF-8");
+    LoggingKt.logbackFromPWD();
   }
 
+  private static final Logger logger = LoggerFactory.getLogger(Application.class);
+  private static final Object SYNCOBJ = new Object();
+
   public static void main(String[] params) {
     // setup server
     try {

server/src/main/java/sc/server/Logging.kt

@@ -0,0 +1,14 @@
+package sc.server
+
+import ch.qos.logback.classic.util.ContextInitializer
+import java.io.File
+
+fun logbackFromPWD() {
+    System.setProperty("file.encoding", "UTF-8")
+    var config = System.getProperty(ContextInitializer.CONFIG_FILE_PROPERTY)
+    if (config == null) {
+        config = System.getProperty("user.dir") + File.separator + "logback.xml"
+        System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, config)
+    }
+    //println("Loading logback config from $config")
+}