2022.5.3.1-Client

OptiJava · May 27, 2022 · ff4a89a · ff4a89a
1 parent b635023
commit ff4a89a
Show file tree

Hide file tree

Showing 45 changed files with 303 additions and 205 deletions.
diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.gradle/workspace-id.txt.lock b/.gradle/workspace-id.txt.lock
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.optilog'
-version '2022.5.3'
+version '2022.5.3.1'
 
 repositories {
     mavenCentral()

diff --git a/build/classes/java/main/com/optilog/log/Log.class b/build/classes/java/main/com/optilog/log/Log.class
diff --git a/build/classes/java/main/com/optilog/log/LogEvent.class b/build/classes/java/main/com/optilog/log/LogEvent.class
diff --git a/build/classes/java/main/com/optilog/log/LogInit.class b/build/classes/java/main/com/optilog/log/LogInit.class
diff --git a/build/classes/java/main/com/optilog/log/Optilog.class b/build/classes/java/main/com/optilog/log/Optilog.class
diff --git a/build/classes/java/main/com/optilog/log/Send.class b/build/classes/java/main/com/optilog/log/Send.class
diff --git a/build/classes/java/main/com/optilog/log/console/Console.class b/build/classes/java/main/com/optilog/log/console/Console.class
diff --git a/build/classes/java/main/com/optilog/log/console/ZipLog.class b/build/classes/java/main/com/optilog/log/console/ZipLog.class
diff --git a/build/classes/java/test/com/optilog/PerformanceTester.class b/build/classes/java/test/com/optilog/PerformanceTester.class
diff --git a/build/classes/java/test/com/optilog/Test.class b/build/classes/java/test/com/optilog/Test.class
diff --git a/build/libs/Optilog-Client-2022.5.3.1.jar b/build/libs/Optilog-Client-2022.5.3.1.jar
diff --git a/build/resources/test/Settings.properties b/build/resources/test/Settings.properties
@@ -3,7 +3,14 @@ printError=true
 printWarn=true
 printDebug=true
 printFatal=true
-defaultConsolePath=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
+#defaultConsolePath=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
+Path1=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
+Path2=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources
+infoPath=%path1
+errorPath=%path2
+warnPath=%path1
+debugPath=%path1
+fatalPath=%path2
 consoleInfo=true
 consoleDebug=true
 consoleError=true

diff --git a/build/resources/test/logs/2022-05-27 17-37-47Log.log b/build/resources/test/logs/2022-05-27 17-37-47Log.log
@@ -0,0 +1,15 @@
+[2022-05-27|17:37:47(29))][com.optilog.OptilogTest main(OptilogTest.java:8)/main] info:---常规输出测试---
+[2022-05-27|17:37:47(32))][com.optilog.OptilogTest main(OptilogTest.java:9)/main] info:infojava.lang.Object@65e2dbf3
+[2022-05-27|17:37:47(33))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] Error:error
+[2022-05-27|17:37:47(33))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] debug:debug32.0
+[2022-05-27|17:37:47(34))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] Warning:warnnull
+[2022-05-27|17:37:47(34))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] info:---占位符---
+[2022-05-27|17:37:47(35))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] info:1 2
+[2022-05-27|17:37:47(35))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] Error:1 1
+[2022-05-27|17:37:47(35))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] Warning:null
+[2022-05-27|17:37:47(36))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] debug:1 2 #3
+[2022-05-27|17:37:47(36))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:de
+[2022-05-27|17:37:47(36))][com.optilog.OptilogTest test(OptilogTest.java:26)/main] Warning:---变化栈测试---
+[2022-05-27|17:37:47(37))][com.optilog.OptilogTest test(OptilogTest.java:27)/main] info:info(test)
+[2022-05-27|17:37:47(37))][com.optilog.OptilogTest test(OptilogTest.java:29)/main] info:$
+[2022-05-27|17:37:47(37))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:28)/Thread-0] info:hello
diff --git a/build/resources/test/logs/2022-05-27 17-38-47Log.log b/build/resources/test/logs/2022-05-27 17-38-47Log.log
@@ -0,0 +1,7 @@
+[2022-05-27|17:38:47(65))][com.optilog.OptilogTest main(OptilogTest.java:8)/main] info:---常规输出测试---
+[2022-05-27|17:38:47(68))][com.optilog.OptilogTest main(OptilogTest.java:9)/main] info:infojava.lang.Object@2b9627bc
+[2022-05-27|17:38:47(69))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] info:---占位符---
+[2022-05-27|17:38:47(70))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] info:1 2
+[2022-05-27|17:38:47(71))][com.optilog.OptilogTest test(OptilogTest.java:27)/main] info:info(test)
+[2022-05-27|17:38:47(71))][com.optilog.OptilogTest test(OptilogTest.java:29)/main] info:$
+[2022-05-27|17:38:47(71))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:28)/Thread-0] info:hello
diff --git a/build/resources/test/logs/2022-05-27 17-39-51Log.log b/build/resources/test/logs/2022-05-27 17-39-51Log.log
@@ -0,0 +1,14 @@
+[2022-05-27|17:39:51(05))][com.optilog.Test main(Test.java:8)/main] info:
+[2022-05-27|17:39:51(08))][com.optilog.log.Optilog getAllField(Optilog.java:826)/main] info:
+class com.optilog.log.Optilog -> com.optilog.log.Optilog@369f73a2:
+    socket(class java.net.DatagramSocket) = java.net.DatagramSocket@67b92f0a
+    consoleFileMasterCaution(boolean) = true
+    alreadyInit(boolean) = true
+    allSetting(class com.optilog.setting.SettingFiles) = com.optilog.setting.SettingFiles@65e2dbf3
+    settingFilePath(class java.lang.String) = %prop -cp /Settings.properties
+    info(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\logs\2022-05-27 17-39-51Log.log
+    error(class java.lang.String) = 
+    warn(class java.lang.String) = 
+    debug(class java.lang.String) = 
+    fatal(class java.lang.String) = 
+end
diff --git a/build/resources/test/logs/2022-05-27 17-44-00(99)LogPackage.zip b/build/resources/test/logs/2022-05-27 17-44-00(99)LogPackage.zip
diff --git a/build/resources/test/logs/2022-05-27 17-44-00Log.log b/build/resources/test/logs/2022-05-27 17-44-00Log.log
@@ -0,0 +1,14 @@
+[2022-05-27|17:44:00(96))][com.optilog.Test main(Test.java:8)/main] info:
+[2022-05-27|17:44:00(98))][com.optilog.log.Optilog getAllField(Optilog.java:826)/main] info:
+class com.optilog.log.Optilog -> com.optilog.log.Optilog@369f73a2:
+    socket(class java.net.DatagramSocket) = java.net.DatagramSocket@67b92f0a
+    consoleFileMasterCaution(boolean) = true
+    alreadyInit(boolean) = true
+    allSetting(class com.optilog.setting.SettingFiles) = com.optilog.setting.SettingFiles@65e2dbf3
+    settingFilePath(class java.lang.String) = %prop -cp /Settings.properties
+    info(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\logs\2022-05-27 17-44-00Log.log
+    error(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\2022-05-27 17-44-00Log.log
+    warn(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\logs\2022-05-27 17-44-00Log.log
+    debug(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\logs\2022-05-27 17-44-00Log.log
+    fatal(class java.lang.String) = D:\Program\Feishu\app\assets\object\apps\Intellij-IDEA\Project\Optilog-Client\src\test\resources\2022-05-27 17-44-00Log.log
+end
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin
diff --git a/src/main/java/com/optilog/log/Log.java b/src/main/java/com/optilog/log/Log.java
@@ -4,17 +4,11 @@
 
 public interface Log {
     static Optilog initLog(String pathOfSettingFile) {
-        Optilog optilog = new Optilog();
-        optilog.settingFilePath = pathOfSettingFile;
-        optilog.alreadyInit = false;
-        return optilog;
+        return new Optilog(pathOfSettingFile, false);
     }
 
     static Optilog reInitLog(String pathOfSettingFile) {
-        Optilog optilog = new Optilog();
-        optilog.settingFilePath = pathOfSettingFile;
-        optilog.alreadyInit = false;
-        return optilog;
+        return new Optilog(pathOfSettingFile, false);
     }
 
     void info();
@@ -170,8 +164,4 @@ static Optilog reInitLog(String pathOfSettingFile) {
     void setServerFatal(boolean serverFatal);
 
     void getAllField(Object instance);
-
-    void shutdown();
-
-    void shutdownNow();
 }
diff --git a/src/main/java/com/optilog/log/LogEvent.java b/src/main/java/com/optilog/log/LogEvent.java
@@ -1,9 +1,9 @@
 package com.optilog.log;
 
 public class LogEvent {
-    public String message;
+    public volatile String message;
 
-    public Level level;
+    public volatile Level level;
 
     @Deprecated
     public String getMessage() {

diff --git a/src/main/java/com/optilog/log/LogInit.java b/src/main/java/com/optilog/log/LogInit.java
@@ -9,12 +9,10 @@
 import com.optilog.util.exception.OptilogException;
 
 import java.io.IOException;
-import java.util.concurrent.Executors;
 
 public class LogInit {
     @OnlyInInit
     public static void initLog(String settingFilePath, Optilog instance) {
-        instance.logThread = Executors.newCachedThreadPool();
         if (settingFilePath.isBlank()) {
             instance.consoleFileMasterCaution = false;
             instance.allSetting = new SettingFiles();

diff --git a/src/main/java/com/optilog/log/Optilog.java b/src/main/java/com/optilog/log/Optilog.java
@@ -5,13 +5,10 @@
 
 import java.lang.reflect.Field;
 import java.net.DatagramSocket;
-import java.util.concurrent.ExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class Optilog implements Log {
-    public volatile ExecutorService logThread;
-
     public volatile DatagramSocket socket;
     public volatile boolean consoleFileMasterCaution = true;
     public volatile boolean alreadyInit;
@@ -26,14 +23,9 @@ public class Optilog implements Log {
     public volatile String debug = "";
     public volatile String fatal = "";
 
-    @Override
-    public void shutdown() {
-        this.logThread.shutdown();
-    }
-
-    @Override
-    public void shutdownNow() {
-        this.logThread.shutdownNow();
+    Optilog(String var1, boolean alreadyInit) {
+        this.settingFilePath = var1;
+        this.alreadyInit = alreadyInit;
     }
 
     @Override

diff --git a/src/main/java/com/optilog/log/Send.java b/src/main/java/com/optilog/log/Send.java
@@ -24,68 +24,58 @@ void loggerConsole(String level, String message, Optilog instance) {
         try {
             if (instance.consoleFileMasterCaution && Level.INFO.getName().equals(level) && !instance.info.isBlank()) {
                 String s = Packing.packMessage(message, level, instance);
-                instance.logThread.submit(() -> {
-                    try {
-                        synchronized (Send.INSTANCE) {
-                            Files.writeString(Path.of(instance.info), Files.readString(Path.of(instance.info), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
-                        }
-                    } catch (IOException e) {
-                        instance.consoleFileMasterCaution = false;
-                        instance.error("Optilog Note:Java throws Exception when log is output", e);
+                try {
+                    synchronized (Send.INSTANCE) {
+                        Files.writeString(Path.of(instance.info), Files.readString(Path.of(instance.info), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
                     }
-                });
+                } catch (IOException e) {
+                    instance.consoleFileMasterCaution = false;
+                    instance.error("Optilog Note:Java throws Exception when log is output", e);
+                }
             }
             if (instance.consoleFileMasterCaution && Level.ERROR.getName().equals(level) && !instance.error.isBlank()) {
                 String s = Packing.packMessage(message, level, instance);
-                instance.logThread.submit(() -> {
-                    try {
-                        synchronized (Send.INSTANCE) {
-                            Files.writeString(Path.of(instance.error), Files.readString(Path.of(instance.error), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
-                        }
-                    } catch (IOException e) {
-                        instance.consoleFileMasterCaution = false;
-                        instance.error("Optilog Note:Java throws Exception when log is output", e);
+                try {
+                    synchronized (Send.INSTANCE) {
+                        Files.writeString(Path.of(instance.error), Files.readString(Path.of(instance.error), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
                     }
-                });
+                } catch (IOException e) {
+                    instance.consoleFileMasterCaution = false;
+                    instance.error("Optilog Note:Java throws Exception when log is output", e);
+                }
             }
             if (instance.consoleFileMasterCaution && Level.DEBUG.getName().equals(level) && !instance.debug.isBlank()) {
                 String s = Packing.packMessage(message, level, instance);
-                instance.logThread.submit(() -> {
-                    try {
-                        synchronized (Send.INSTANCE) {
-                            Files.writeString(Path.of(instance.debug), Files.readString(Path.of(instance.debug), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
-                        }
-                    } catch (IOException e) {
-                        instance.consoleFileMasterCaution = false;
-                        instance.error("Optilog Note:Java throws Exception when log is output", e);
+                try {
+                    synchronized (Send.INSTANCE) {
+                        Files.writeString(Path.of(instance.debug), Files.readString(Path.of(instance.debug), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
                     }
-                });
+                } catch (IOException e) {
+                    instance.consoleFileMasterCaution = false;
+                    instance.error("Optilog Note:Java throws Exception when log is output", e);
+                }
             }
             if (instance.consoleFileMasterCaution && Level.WARN.getName().equals(level) && !instance.warn.isBlank()) {
                 String s = Packing.packMessage(message, level, instance);
-                instance.logThread.submit(() -> {
-                    try {
-                        synchronized (Send.INSTANCE) {
-                            Files.writeString(Path.of(instance.warn), Files.readString(Path.of(instance.warn), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
-                        }
-                    } catch (IOException e) {
-                        instance.consoleFileMasterCaution = false;
-                        instance.error("Optilog Note:Java throws Exception when log is output", e);
+                try {
+                    synchronized (Send.INSTANCE) {
+                        Files.writeString(Path.of(instance.warn), Files.readString(Path.of(instance.warn), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
                     }
-                });
+                } catch (IOException e) {
+                    instance.consoleFileMasterCaution = false;
+                    instance.error("Optilog Note:Java throws Exception when log is output", e);
+                }
             }
             if (instance.consoleFileMasterCaution && Level.FATAL.getName().equals(level) && !instance.fatal.isBlank()) {
                 String s = Packing.packMessage(message, level, instance);
-                instance.logThread.submit(() -> {
-                    try {
-                        synchronized (Send.INSTANCE) {
-                            Files.writeString(Path.of(instance.fatal), Files.readString(Path.of(instance.fatal), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
-                        }
-                    } catch (IOException e) {
-                        instance.consoleFileMasterCaution = false;
-                        instance.error("Optilog Note:Java throws Exception when log is output", e);
+                try {
+                    synchronized (Send.INSTANCE) {
+                        Files.writeString(Path.of(instance.fatal), Files.readString(Path.of(instance.fatal), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);
                     }
-                });
+                } catch (IOException e) {
+                    instance.consoleFileMasterCaution = false;
+                    instance.error("Optilog Note:Java throws Exception when log is output", e);
+                }
             }
         } catch (RuntimeException e) {
             instance.consoleFileMasterCaution = false;
@@ -98,7 +88,7 @@ void loggerToServer(final String level, String message, final Optilog instance)
         synchronized (Send.INSTANCE) {
             message = Packing.packMessage(message, level, instance);
             String finalMessage = message;
-            instance.logThread.submit(() -> Client.send(finalMessage + level, instance));
+            Client.send(finalMessage + level, instance);
         }
     }
 }
diff --git a/src/main/java/com/optilog/log/console/Console.java b/src/main/java/com/optilog/log/console/Console.java
@@ -13,7 +13,6 @@ public class Console {
     @OnlyInInit
     public static void file(Optilog instance) {
         if (instance.consoleFileMasterCaution) {
-
             if (instance.allSetting != null) {
                 instance.allSetting.fileName = instance.allSetting.fileName.replace("%time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss").format(LocalDateTime.now()));
             } else {
@@ -55,7 +54,6 @@ public static void file(Optilog instance) {
                         if (!file.createNewFile()) {
                             throw new IOException("Create new file failed!");
                         }
-
                     }
                     instance.allSetting.Path1 = file.getAbsolutePath();
                 } catch (IOException e) {
@@ -133,8 +131,7 @@ public static void file(Optilog instance) {
                         instance.info = instance.allSetting.Path5;
                     }
                     if (instance.info.equals("")) {
-                        instance.consoleFileMasterCaution = false;
-                        Util.getOutput().println("Optilog Note:Init console failed.");
+                        instance.allSetting.consoleInfo = false;
                     }
                 } catch (NullPointerException e) {
                     instance.consoleFileMasterCaution = false;
@@ -159,8 +156,7 @@ public static void file(Optilog instance) {
                         instance.error = instance.allSetting.Path5;
                     }
                     if (instance.error.equals("")) {
-                        instance.consoleFileMasterCaution = false;
-                        Util.getOutput().println("Optilog Note:Init console failed.");
+                        instance.allSetting.consoleError = false;
                     }
                 } catch (NullPointerException e) {
                     instance.consoleFileMasterCaution = false;
@@ -185,8 +181,7 @@ public static void file(Optilog instance) {
                         instance.warn = instance.allSetting.Path5;
                     }
                     if (instance.warn.equals("")) {
-                        instance.consoleFileMasterCaution = false;
-                        Util.getOutput().println("Optilog Note:Init console failed.");
+                        instance.allSetting.consoleWarn = false;
                     }
                 } catch (NullPointerException e) {
                     instance.consoleFileMasterCaution = false;
@@ -211,8 +206,7 @@ public static void file(Optilog instance) {
                         instance.debug = instance.allSetting.Path5;
                     }
                     if (instance.debug.equals("")) {
-                        instance.consoleFileMasterCaution = false;
-                        Util.getOutput().println("Optilog Note:Init console failed.");
+                        instance.allSetting.consoleDebug = false;
                     }
                 } catch (NullPointerException e) {
                     instance.consoleFileMasterCaution = false;
@@ -237,8 +231,7 @@ public static void file(Optilog instance) {
                         instance.fatal = instance.allSetting.Path5;
                     }
                     if (instance.fatal.equals("")) {
-                        instance.consoleFileMasterCaution = false;
-                        Util.getOutput().println("Optilog Note:Init console failed.");
+                        instance.allSetting.consoleFatal = false;
                     }
                 } catch (NullPointerException e) {
                     instance.consoleFileMasterCaution = false;