integrate HSCore Logger

HSGamer · Jan 12, 2024 · d2e8161 · d2e8161
1 parent bc665bc
commit d2e8161
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 37 deletions.
diff --git a/mc-server-updater-lib/pom.xml b/mc-server-updater-lib/pom.xml
@@ -22,17 +22,22 @@
         <dependency>
             <groupId>me.hsgamer</groupId>
             <artifactId>hscore-collections</artifactId>
-            <version>4.1.18</version>
+            <version>4.3.26</version>
         </dependency>
         <dependency>
             <groupId>me.hsgamer</groupId>
             <artifactId>hscore-web</artifactId>
-            <version>4.1.18</version>
+            <version>4.3.26</version>
+        </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-logger-common</artifactId>
+            <version>4.3.26</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220320</version>
+            <version>20231013</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/UpdateBuilder.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/UpdateBuilder.java
@@ -1,6 +1,8 @@
 package me.hsgamer.mcserverupdater;
 
 import me.hsgamer.hscore.collections.map.CaseInsensitiveStringHashMap;
+import me.hsgamer.hscore.logger.common.LogLevel;
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.mcserverupdater.api.Checksum;
 import me.hsgamer.mcserverupdater.api.Updater;
 import me.hsgamer.mcserverupdater.updater.*;
@@ -53,7 +55,7 @@ public final class UpdateBuilder {
     private ChecksumSupplier checksumSupplier = () -> "";
     private ChecksumConsumer checksumConsumer = s -> {
     };
-    private Consumer<String> debugConsumer = s -> {
+    private Logger logger = (logLevel, s) -> {
     };
 
     private UpdateBuilder(String project) {
@@ -166,15 +168,25 @@ public UpdateBuilder checksumConsumer(ChecksumConsumer checksumConsumer) {
         return this;
     }
 
+    /**
+     * Set the logger
+     *
+     * @param logger the logger
+     * @return the update process
+     */
+    public UpdateBuilder logger(Logger logger) {
+        this.logger = logger;
+        return this;
+    }
+
     /**
      * Set the debug consumer
      *
      * @param debugConsumer the debug consumer
      * @return the update process
      */
     public UpdateBuilder debugConsumer(Consumer<String> debugConsumer) {
-        this.debugConsumer = debugConsumer;
-        return this;
+        return logger((logLevel, s) -> debugConsumer.accept("[" + logLevel.name() + "] " + s));
     }
 
     /**
@@ -260,12 +272,12 @@ public File workingDirectory() {
     }
 
     /**
-     * Get the debug consumer
+     * Get the logger
      *
-     * @return the debug consumer
+     * @return the logger
      */
-    public Consumer<String> debugConsumer() {
-        return debugConsumer;
+    public Logger logger() {
+        return logger;
     }
 
     /**
@@ -274,7 +286,7 @@ public Consumer<String> debugConsumer() {
      * @param message the message
      */
     public void debug(String message) {
-        debugConsumer.accept(message);
+        logger.log(LogLevel.DEBUG, message);
     }
 
     /**

diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubBranchUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubBranchUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.api;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -106,7 +107,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubReleaseUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/GithubReleaseUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.api;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -114,7 +115,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/JenkinsUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/JenkinsUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.api;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -122,7 +123,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/Updater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/api/Updater.java
@@ -1,27 +1,28 @@
 package me.hsgamer.mcserverupdater.api;
 
+import me.hsgamer.hscore.logger.common.LogLevel;
+import me.hsgamer.hscore.logger.common.Logger;
+
 import java.io.File;
-import java.util.Optional;
 
 public interface Updater {
     boolean update(File file) throws Exception;
 
-    void debug(String message);
+    Logger getLogger();
+
+    default void debug(String message) {
+        getLogger().log(LogLevel.DEBUG, message);
+    }
 
     default void debug(String format, Object... args) {
         debug(String.format(format, args));
     }
 
     default void debug(Throwable throwable) {
-        debug(throwable.getClass().getName() + ": " + throwable.getMessage());
-        for (StackTraceElement element : throwable.getStackTrace()) {
-            debug("    " + element.toString());
-        }
-        Optional.ofNullable(throwable.getCause()).ifPresent(cause -> debug("Caused by: " + cause.getMessage(), cause));
+        getLogger().log(LogLevel.DEBUG, throwable);
     }
 
     default void debug(String message, Throwable throwable) {
-        debug(message);
-        debug(throwable);
+        getLogger().log(LogLevel.DEBUG, message, throwable);
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/FabricUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/FabricUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.updater;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -117,7 +118,7 @@ public String getCurrentChecksum(File file) throws Exception {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/PaperUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/PaperUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.updater;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -110,7 +111,7 @@ public InputStream getInputStream() {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/PurpurUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/PurpurUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.updater;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -91,7 +92,7 @@ public String getChecksum() {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/SpigotUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/SpigotUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.updater;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -64,8 +65,8 @@ public boolean update(File file) throws Exception {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 
     private boolean runBuildTools(File buildTools, File outputDir) throws IOException, InterruptedException {

diff --git a/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/SpongeUpdater.java b/mc-server-updater-lib/src/main/java/me/hsgamer/mcserverupdater/updater/SpongeUpdater.java
@@ -1,5 +1,6 @@
 package me.hsgamer.mcserverupdater.updater;
 
+import me.hsgamer.hscore.logger.common.Logger;
 import me.hsgamer.hscore.web.UserAgent;
 import me.hsgamer.hscore.web.WebUtils;
 import me.hsgamer.mcserverupdater.UpdateBuilder;
@@ -131,7 +132,7 @@ public String getChecksum() {
     }
 
     @Override
-    public void debug(String message) {
-        updateBuilder.debug(message);
+    public Logger getLogger() {
+        return updateBuilder.logger();
     }
 }
diff --git a/mc-server-updater-standalone/pom.xml b/mc-server-updater-standalone/pom.xml
@@ -57,5 +57,10 @@
             <artifactId>jopt-simple</artifactId>
             <version>6.0-alpha-3</version>
         </dependency>
+        <dependency>
+            <groupId>me.hsgamer</groupId>
+            <artifactId>hscore-logger-jul</artifactId>
+            <version>4.3.26</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/mc-server-updater-standalone/src/main/java/me/hsgamer/mcserverupdater/MCServerUpdater.java b/mc-server-updater-standalone/src/main/java/me/hsgamer/mcserverupdater/MCServerUpdater.java
@@ -3,6 +3,7 @@
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
+import me.hsgamer.hscore.logger.jul.JulLogger;
 
 import java.io.BufferedReader;
 import java.io.PrintWriter;
@@ -72,7 +73,7 @@ public static void main(String[] args) throws Exception {
                 .workingDirectory(workingDirectoryName)
                 .outputFile(outputName)
                 .checksumFile(checksumFileName)
-                .debugConsumer(LOGGER::fine);
+                .logger(new JulLogger(LOGGER));
 
         try {
             LOGGER.info("Start updating...");