重新实现日志记录 (#2951)

* update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update
HMCL-dev · Mar 28, 2024 · 57018be · 57018be
1 parent 0b65431
commit 57018be
Show file tree

Hide file tree

Showing 113 changed files with 864 additions and 632 deletions.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
@@ -51,10 +51,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Launcher extends Application {
@@ -71,7 +70,7 @@ public void start(Stage primaryStage) {
             Object pipeline = Class.forName("com.sun.prism.GraphicsPipeline").getMethod("getPipeline").invoke(null);
             LOG.info("Prism pipeline: " + (pipeline == null ? "null" : pipeline.getClass().getName()));
         } catch (Throwable e) {
-            LOG.log(Level.WARNING, "Failed to get prism pipeline", e);
+            LOG.warning("Failed to get prism pipeline", e);
         }
 
         try {
@@ -80,7 +79,7 @@ public void start(Stage primaryStage) {
             } catch (SambaException ignored) {
                 Main.showWarningAndContinue(i18n("fatal.samba"));
             } catch (IOException e) {
-                LOG.log(Level.SEVERE, "Failed to load config", e);
+                LOG.error("Failed to load config", e);
                 checkConfigInTempDir();
                 checkConfigOwner();
                 Main.showErrorAndExit(i18n("fatal.config_loading_failure", ConfigHolder.configLocation().getParent()));
@@ -165,7 +164,7 @@ private static boolean isConfigInTempDir() {
     private static void checkConfigInTempDir() {
         if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
                 && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
-            System.exit(0);
+            Main.exit(0);
         }
     }
 
@@ -178,7 +177,7 @@ private static void checkConfigOwner() {
         try {
             owner = Files.getOwner(ConfigHolder.configLocation()).getName();
         } catch (IOException ioe) {
-            LOG.log(Level.WARNING, "Failed to get file owner", ioe);
+            LOG.warning("Failed to get file owner", ioe);
             return;
         }
 
@@ -203,17 +202,18 @@ private static void checkConfigOwner() {
             Clipboard.getSystemClipboard()
                     .setContent(Collections.singletonMap(DataFormat.PLAIN_TEXT, command));
         }
-        System.exit(1);
+        Main.exit(1);
     }
 
     @Override
     public void stop() throws Exception {
-        super.stop();
         Controllers.onApplicationStop();
+        LOG.shutdown();
     }
 
     public static void main(String[] args) {
         if (UpdateHandler.processArguments(args)) {
+            LOG.shutdown();
             return;
         }
 
@@ -231,6 +231,7 @@ public static void main(String[] args) {
             LOG.info("Current Directory: " + System.getProperty("user.dir"));
             LOG.info("HMCL Directory: " + Metadata.HMCL_DIRECTORY);
             LOG.info("HMCL Jar Path: " + Lang.requireNonNullElse(JarUtils.thisJarPath(), "Not Found"));
+            LOG.info("HMCL Log File: " + Lang.requireNonNullElse(LOG.getLogFile(), "In Memory"));
             LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
             LOG.info("Physical memory: " + OperatingSystem.TOTAL_MEMORY + " MB");
             LOG.info("Metaspace: " + ManagementFactory.getMemoryPoolMXBeans().stream()

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
@@ -21,7 +21,6 @@
 import javafx.scene.control.Alert;
 import org.jackhuang.hmcl.ui.AwtUtils;
 import org.jackhuang.hmcl.util.FractureiserDetector;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.SelfDependencyPatcher;
 import org.jackhuang.hmcl.ui.SwingUtils;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
@@ -43,10 +42,9 @@
 import java.security.cert.CertificateException;
 import java.util.Collections;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Main {
@@ -59,6 +57,8 @@ public static void main(String[] args) {
         System.getProperties().putIfAbsent("javafx.autoproxy.disable", "true");
         System.getProperties().putIfAbsent("http.agent", "HMCL/" + Metadata.VERSION);
 
+        LOG.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
+
         checkDirectoryPath();
 
         if (JavaVersion.CURRENT_JAVA.getParsedVersion() < 9)
@@ -68,15 +68,18 @@ public static void main(String[] args) {
         if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
             initIcon();
 
-        Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
-
         checkJavaFX();
         verifyJavaFX();
         detectFractureiser();
 
         Launcher.main(args);
     }
 
+    public static void exit(int exitCode) {
+        LOG.shutdown();
+        System.exit(exitCode);
+    }
+
     private static void initIcon() {
         java.awt.Image image = java.awt.Toolkit.getDefaultToolkit().getImage(Main.class.getResource("/assets/img/icon@8x.png"));
         AwtUtils.setAppleIcon(image);
@@ -93,7 +96,7 @@ private static void checkDirectoryPath() {
 
     private static void detectFractureiser() {
         if (FractureiserDetector.detect()) {
-            LOG.log(Level.SEVERE, "Detected that this computer is infected by fractureiser");
+            LOG.error("Detected that this computer is infected by fractureiser");
             showErrorAndExit(i18n("fatal.fractureiser"));
         }
     }
@@ -102,14 +105,14 @@ private static void checkJavaFX() {
         try {
             SelfDependencyPatcher.patch();
         } catch (SelfDependencyPatcher.PatchException e) {
-            LOG.log(Level.SEVERE, "unable to patch JVM", e);
+            LOG.error("unable to patch JVM", e);
             showErrorAndExit(i18n("fatal.javafx.missing"));
         } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
-            LOG.log(Level.SEVERE, "unable to patch JVM", e);
+            LOG.error("unable to patch JVM", e);
             showErrorAndExit(i18n("fatal.javafx.incompatible"));
         } catch (CancellationException e) {
-            LOG.log(Level.SEVERE, "User cancels downloading JavaFX", e);
-            System.exit(0);
+            LOG.error("User cancels downloading JavaFX", e);
+            exit(0);
         }
     }
 
@@ -136,13 +139,13 @@ static void showErrorAndExit(String message) {
         try {
             if (Platform.isFxApplicationThread()) {
                 new Alert(Alert.AlertType.ERROR, message).showAndWait();
-                System.exit(1);
+                exit(1);
             }
         } catch (Throwable ignored) {
         }
 
         SwingUtils.showErrorDialog(message);
-        System.exit(1);
+        exit(1);
     }
 
     /**
@@ -192,7 +195,7 @@ private static void fixLetsEncrypt() {
             LOG.info("Added Lets Encrypt root certificates as additional trust");
         } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException |
                  KeyManagementException e) {
-            LOG.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
+            LOG.error("Failed to load lets encrypt certificate. Expect problems", e);
         }
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java b/HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java
@@ -1,7 +1,6 @@
 package org.jackhuang.hmcl.countly;
 
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -13,6 +12,7 @@
 
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class CrashReport {
 
@@ -59,7 +59,7 @@ public Map<String, Object> getMetrics(long runningTime) {
                 pair("_ram_current", getMemoryAvailable()),
                 pair("_ram_total", Runtime.getRuntime().maxMemory() / BYTES_IN_MB),
                 pair("_error", stackTrace),
-                pair("_logs", Logging.getLogs()),
+                pair("_logs", LOG.getLogs()),
                 pair("_name", throwable.getLocalizedMessage()),
                 pair("_nonfatal", nonFatal)
         );

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java
@@ -21,7 +21,6 @@
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
@@ -30,7 +29,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
-import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 /**
  * @author huangyuhui
@@ -96,7 +96,7 @@ private void generateOptionsTxt() {
             try {
                 FileUtils.writeText(optionsFile, String.format("lang:%s\n", lang));
             } catch (IOException e) {
-                Logging.LOG.log(Level.WARNING, "Unable to generate options.txt", e);
+                LOG.warning("Unable to generate options.txt", e);
             }
         }
     }

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java
@@ -50,12 +50,11 @@
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 
 public class HMCLGameRepository extends DefaultGameRepository {
@@ -124,7 +123,7 @@ protected void refreshVersionsImpl() {
             if (!file.exists() && !versions.isEmpty())
                 FileUtils.writeText(file, PROFILE);
         } catch (IOException ex) {
-            LOG.log(Level.WARNING, "Unable to create launcher_profiles.json, Forge/LiteLoader installer will not work.", ex);
+            LOG.warning("Unable to create launcher_profiles.json, Forge/LiteLoader installer will not work.", ex);
         }
 
         // https://github.com/HMCL-dev/HMCL/issues/938
@@ -319,7 +318,7 @@ public Image getVersionIconImage(String id) {
                 try (InputStream inputStream = new FileInputStream(iconFile.get())) {
                     return new Image(inputStream);
                 } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to load version icon of " + id, e);
+                    LOG.warning("Failed to load version icon of " + id, e);
                 }
             }
 
@@ -358,7 +357,7 @@ public boolean saveVersionSetting(String id) {
             FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
             return true;
         } catch (IOException e) {
-            LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
+            LOG.error("Unable to save version setting of " + id, e);
             return false;
         }
     }

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
@@ -60,13 +60,12 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -112,7 +111,7 @@ public void setKeep() {
     public void launch() {
         FXUtils.checkFxUserThread();
 
-        Logging.LOG.info("Launching game version: " + selectedVersion);
+        LOG.info("Launching game version: " + selectedVersion);
 
         Controllers.dialog(launchingStepsPane);
         launch0();
@@ -389,7 +388,7 @@ private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting
                                     future.complete(downloadedJavaVersion);
                                 })
                                 .exceptionally(throwable -> {
-                                    LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                    LOG.warning("Failed to download java", throwable);
                                     Controllers.confirm(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING, continueAction, () -> {
                                         future.completeExceptionally(new CancellationException("No accepted java"));
                                     });
@@ -452,7 +451,7 @@ private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting
                                         future.complete(downloadedJavaVersion);
                                     }, Schedulers.javafx())
                                     .whenCompleteAsync((result, throwable) -> {
-                                        LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                        LOG.warning("Failed to download java", throwable);
                                         breakAction.run();
                                     }, Schedulers.javafx());
                             return Task.fromCompletableFuture(future);
@@ -605,7 +604,7 @@ private static CompletableFuture<JavaVersion> downloadJava(String gameVersion, G
                             .thenAcceptAsync(future::complete)
                             .exceptionally(throwable -> {
                                 Throwable resolvedException = resolveException(throwable);
-                                LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                LOG.warning("Failed to download java", throwable);
                                 if (!(resolvedException instanceof CancellationException)) {
                                     Controllers.dialog(DownloadProviders.localizeErrorMessage(resolvedException), i18n("install.failed"));
                                 }
@@ -644,11 +643,11 @@ private static Task<AuthInfo> logIn(Account account) {
             try {
                 return Task.completed(account.logIn());
             } catch (CredentialExpiredException e) {
-                LOG.log(Level.INFO, "Credential has expired", e);
+                LOG.info("Credential has expired", e);
 
                 return Task.completed(DialogController.logIn(account));
             } catch (AuthenticationException e) {
-                LOG.log(Level.WARNING, "Authentication failed, try skipping refresh", e);
+                LOG.warning("Authentication failed, try skipping refresh", e);
 
                 CompletableFuture<Task<AuthInfo>> future = new CompletableFuture<>();
                 runInFX(() -> {

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LocalizedRemoteModRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LocalizedRemoteModRepository.java
@@ -27,10 +27,9 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.stream.Stream;
 
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public abstract class LocalizedRemoteModRepository implements RemoteModRepository {
     private static final int CONTAIN_CHINESE_WEIGHT = 10;
@@ -69,7 +68,7 @@ public SearchResult search(String gameVersion, Category category, int pageOffset
             SearchResult searchResult = getBackedRemoteModRepository().search(gameVersion, category, pageOffset, pageSize, String.join(" ", englishSearchFiltersSet), getBackedRemoteModRepositorySortOrder(), sortOrder);
             for (Iterator<RemoteMod> iterator = searchResult.getUnsortedResults().iterator(); iterator.hasNext(); ) {
                 if (chineseIndex > englishIndex) {
-                    LOG.log(Level.WARNING, "Too many search results! Are the backed remote mod repository broken? Or are the API broken?");
+                    LOG.warning("Too many search results! Are the backed remote mod repository broken? Or are the API broken?");
                     continue;
                 }