From 1f190e5659c25517a2401fbf41e54c9fd3535dcc Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Fri, 24 Jul 2020 13:57:14 -0400
Subject: [PATCH] logging progress

---
 java_console/ui/src/main/java/com/rusefi/Launcher.java | 10 +++++++---
 java_tools/proxy_server/src/main/resources/log4j2.xml  |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java_console/ui/src/main/java/com/rusefi/Launcher.java b/java_console/ui/src/main/java/com/rusefi/Launcher.java
index 37b7dcd581..93e80dcca6 100644
--- a/java_console/ui/src/main/java/com/rusefi/Launcher.java
+++ b/java_console/ui/src/main/java/com/rusefi/Launcher.java
@@ -1,11 +1,14 @@
 package com.rusefi;
 
+import com.devexperts.logging.Logging;
 import com.rusefi.tools.ConsoleTools;
 import com.rusefi.ui.engine.EngineSnifferPanel;
 import com.rusefi.ui.storage.PersistentConfiguration;
 
 import java.util.Date;
 
+import static com.devexperts.logging.Logging.getLogging;
+
 /**
  * this is the main entry point of rusEfi ECU console
  * <p/>
@@ -17,6 +20,7 @@ import java.util.Date;
  * @see EngineSnifferPanel
  */
 public class Launcher extends rusEFIVersion {
+    private static final Logging log = getLogging(Launcher.class);
     public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
     public static final String TOOLS_PATH = System.getProperty("tools_path", ".");
 
@@ -26,9 +30,9 @@ public class Launcher extends rusEFIVersion {
      * @see StartupFrame if no parameters specified
      */
     public static void main(final String[] args) throws Exception {
-        System.out.println("rusEFI UI console " + CONSOLE_VERSION);
-        System.out.println("Compiled " + new Date(ConsoleTools.classBuildTimeMillis()));
-        System.out.println("\n\n");
+        log.info("rusEFI UI console " + CONSOLE_VERSION);
+        log.info("Compiled " + new Date(ConsoleTools.classBuildTimeMillis()));
+        log.info("\n\n");
         PersistentConfiguration.registerShutdownHook();
 
         if (ConsoleTools.runTool(args)) {
diff --git a/java_tools/proxy_server/src/main/resources/log4j2.xml b/java_tools/proxy_server/src/main/resources/log4j2.xml
index 7939744706..82ce630ca9 100644
--- a/java_tools/proxy_server/src/main/resources/log4j2.xml
+++ b/java_tools/proxy_server/src/main/resources/log4j2.xml
@@ -3,7 +3,7 @@
     <Appenders>
         <RollingFile name="R" fileName="log/proxy.log"
                      filePattern="log/proxy.log.%i.zip">
-            <DetailedLogLayout2/>
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-1level [%t] %logger{36} - %msg%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500M"/>
             </Policies>
@@ -12,7 +12,7 @@
         <RollingFile name="E" fileName="log/proxy.err"
                      filePattern="log/proxy.err.%i.zip">
             <ThresholdFilter level="WARN"/>
-            <DetailedLogLayout2/>
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-1level [%t] %logger{36} - %msg%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="500M"/>
             </Policies>