2022.5.4-Client

OptiJava · May 27, 2022 · ee4f32b · ee4f32b
1 parent 0998c38
commit ee4f32b
Show file tree

Hide file tree

Showing 46 changed files with 131 additions and 353 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/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
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.1'
+version '2022.5.4'
 
 repositories {
     mavenCentral()

diff --git a/build/classes/java/main/com/optilog/log/Logger.class b/build/classes/java/main/com/optilog/log/Logger.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/main/com/optilog/setting/SettingFiles.class b/build/classes/java/main/com/optilog/setting/SettingFiles.class
diff --git a/build/classes/java/test/com/optilog/OptilogTest.class b/build/classes/java/test/com/optilog/OptilogTest.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.4.jar b/build/libs/Optilog-Client-2022.5.4.jar
diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html
@@ -85,7 +85,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.4</a> at 2022年5月27日 下午12:47:24</p>
+<a href="http://www.gradle.org">Gradle 7.4</a> at 2022年5月27日 下午8:59:17</p>
 </div>
 </div>
 </body>

diff --git a/build/resources/test/Settings.properties b/build/resources/test/Settings.properties
@@ -3,14 +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
-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
+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-26 15-36-21Log.log b/build/resources/test/logs/2022-05-26 15-36-21Log.log
diff --git a/build/resources/test/logs/2022-05-27 12-40-49Log.log b/build/resources/test/logs/2022-05-27 12-40-49Log.log
diff --git a/build/resources/test/logs/2022-05-27 12-45-22Log.log b/build/resources/test/logs/2022-05-27 12-45-22Log.log
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
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
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
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
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/Logger.java b/src/main/java/com/optilog/log/Logger.java
@@ -110,10 +110,10 @@ void logFatal(LogEvent le, Optilog instance) {
     static void logCommand(String command, Optilog instance) {
         if (command.equals("%stop -client")) {
             Client.stop(instance);
-        } else if (command.equals("%zip")) {
-            ZipLog.zipAllLog(false, instance);
-        } else if (command.equals("%zip -d")) {
-            ZipLog.zipAllLog(true, instance);
+        } else if (command.startsWith("%zip -d")) {
+            ZipLog.zipAllLog(true, instance, command.substring(8));
+        } else if (command.startsWith("%zip")) {
+            ZipLog.zipAllLog(false, instance, command.substring(5));
         } else {
             try {
                 throw new InvalidCommandException("Invalid Command '" + command + "' ", new IllegalArgumentException());

diff --git a/src/main/java/com/optilog/log/console/ZipLog.java b/src/main/java/com/optilog/log/console/ZipLog.java
@@ -1,8 +1,6 @@
 package com.optilog.log.console;
 
-import com.optilog.log.LogInit;
 import com.optilog.log.Optilog;
-import com.optilog.util.Util;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14,172 +12,33 @@
 import java.util.zip.ZipOutputStream;
 
 public class ZipLog {
-    public static void zipAllLog(boolean delete, Optilog instance) {
-        if (!instance.alreadyInit) {
-            LogInit.initLog(instance.settingFilePath, instance);
-        }
+    public static void zipAllLog(boolean delete, Optilog instance, String path) {
+        File f = new File(path + "//" + DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss(SS)").format(LocalDateTime.now()) + "LogPackage.zip");
         try {
-            String s = DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss(SS)").format(LocalDateTime.now());
-            File info = new File(instance.info.substring(0, instance.info.length() - (instance.allSetting.fileName.length() + 1)) + "//" + s + "LogPackage.zip");
-            File error = new File(instance.error.substring(0, instance.error.length() - (instance.allSetting.fileName.length() + 1)) + "//" + s + "LogPackage.zip");
-            File warn = new File(instance.warn.substring(0, instance.warn.length() - (instance.allSetting.fileName.length() + 1)) + "//" + s + "LogPackage.zip");
-            File debug = new File(instance.debug.substring(0, instance.debug.length() - (instance.allSetting.fileName.length() + 1)) + "//" + s + "LogPackage.zip");
-            File fatal = new File(instance.fatal.substring(0, instance.fatal.length() - (instance.allSetting.fileName.length() + 1)) + "//" + s + "LogPackage.zip");
-            try {
-                if (!info.isFile()) {
-                    if (!info.createNewFile()) {
-                        Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                        return;
-                    }
-                }
-                if (!error.isFile()) {
-                    if (!error.createNewFile()) {
-                        Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                        return;
-                    }
-                }
-                if (!warn.isFile()) {
-                    if (!warn.createNewFile()) {
-                        Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                        return;
-                    }
-                }
-                if (!debug.isFile()) {
-                    if (!debug.createNewFile()) {
-                        Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                        return;
-                    }
-                }
-                if (!fatal.isFile()) {
-                    if (!fatal.createNewFile()) {
-                        Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                        return;
-                    }
-                }
-            } catch (IOException e) {
-                Util.getOutput().println("Optilog Note:Failed to create zip file!");
-                e.printStackTrace();
-                return;
-            }
-            try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(info))) {
-                File[] file = new File(instance.info.substring(0, instance.info.length() - (instance.allSetting.fileName.length() + 1))).listFiles();
-                if (file != null) {
-                    for (File f : file) {
-                        if (f.getName().endsWith(".log")) {
-                            output.putNextEntry(new ZipEntry(f.getName()));
-                            output.write(Files.readAllBytes(f.toPath()));
-                            output.closeEntry();
-                            if (delete) {
-                                if (!f.delete()) {
-                                    instance.warn("Optilog Note:Delete #1 failed!", f.getName());
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    instance.info("Optilog Note:No log file in info file path.");
-                }
-            } catch (IOException e) {
-                instance.error("Optilog Note:Failed to pack log file.", e);
-            }
-
-            if (!error.isFile()) {
-                try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(error))) {
-                    File[] file = new File(instance.error.substring(0, instance.error.length() - (instance.allSetting.fileName.length() + 1))).listFiles();
-                    if (file != null) {
-                        for (File f : file) {
-                            if (f.getName().endsWith(".log")) {
-                                output.putNextEntry(new ZipEntry(f.getName()));
-                                output.write(Files.readAllBytes(f.toPath()));
-                                output.closeEntry();
-                                if (delete) {
-                                    if (!f.delete()) {
-                                        instance.warn("Optilog Note:Delete #1 failed!", f.getName());
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        instance.info("Optilog Note:No log file in error file path.");
-                    }
-                } catch (IOException e) {
-                    instance.error("Optilog Note:Failed to pack log file.", e);
-                }
-            }
-
-            if (!warn.isFile()) {
-                try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(warn))) {
-                    File[] file = new File(instance.warn.substring(0, instance.warn.length() - (instance.allSetting.fileName.length() + 1))).listFiles();
-                    if (file != null) {
-                        for (File f : file) {
-                            if (f.getName().endsWith(".log")) {
-                                output.putNextEntry(new ZipEntry(f.getName()));
-                                output.write(Files.readAllBytes(f.toPath()));
-                                output.closeEntry();
-                                if (delete) {
-                                    if (!f.delete()) {
-                                        instance.warn("Optilog Note:Delete #1 failed!", f.getName());
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        instance.info("Optilog Note:No log file in warn file path.");
-                    }
-                } catch (IOException e) {
-                    instance.error("Optilog Note:Failed to pack log file.", e);
-                }
-            }
-
-            if (!debug.isFile()) {
-                try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(debug))) {
-                    File[] file = new File(instance.debug.substring(0, instance.debug.length() - (instance.allSetting.fileName.length() + 1))).listFiles();
-                    if (file != null) {
-                        for (File f : file) {
-                            if (f.getName().endsWith(".log")) {
-                                output.putNextEntry(new ZipEntry(f.getName()));
-                                output.write(Files.readAllBytes(f.toPath()));
-                                output.closeEntry();
-                                if (delete) {
-                                    if (!f.delete()) {
-                                        instance.warn("Optilog Note:Delete #1 failed!", f.getName());
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        instance.info("Optilog Note:No log file in debug file path.");
-                    }
-                } catch (IOException e) {
-                    instance.error("Optilog Note:Failed to pack log file.", e);
-                }
-            }
-
-            if (!fatal.isFile()) {
-                try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(fatal))) {
-                    File[] file = new File(instance.fatal.substring(0, instance.fatal.length() - (instance.allSetting.fileName.length() + 1))).listFiles();
-                    if (file != null) {
-                        for (File f : file) {
-                            if (f.getName().endsWith(".log")) {
-                                output.putNextEntry(new ZipEntry(f.getName()));
-                                output.write(Files.readAllBytes(f.toPath()));
-                                output.closeEntry();
-                                if (delete) {
-                                    if (!f.delete()) {
-                                        instance.warn("Optilog Note:Delete #1 failed!", f.getName());
-                                    }
-                                }
-                            }
+            f.createNewFile();
+        } catch (IOException e) {
+            instance.warn("Optilog Note: Failed to create log package zip.");
+            return;
+        }
+
+        try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(f))) {
+            File[] file = new File(path).listFiles();
+            if (file != null) {
+                for (File fff : file) {
+                    if (fff.getName().endsWith(".log")) {
+                        output.putNextEntry(new ZipEntry(fff.getName()));
+                        output.write(Files.readAllBytes(fff.toPath()));
+                        output.closeEntry();
+                        if (delete) {
+                            fff.delete();
                         }
-                    } else {
-                        instance.info("Optilog Note:No log file in fatal file path.");
                     }
-                } catch (IOException e) {
-                    instance.error("Optilog Note:Failed to pack log file.", e);
                 }
+            } else {
+                instance.info("Optilog Note:No log file in fatal file path.");
             }
-        } catch (StringIndexOutOfBoundsException e) {
-            Util.getOutput().println("Please set 4 xxxxPath in setting files!");
+        } catch (IOException e) {
+            instance.error("Optilog Note:Failed to pack log file.", e);
         }
     }
 }