AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-22 10:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

清理 org.jackhuang.hmcl.util.logging (#4484)

Browse Source
This commit is contained in:
Glavo 2025-09-15 15:21:14 +08:00 committed by GitHub
parent a7178802f8
commit 7ce59cac2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Level.java
View File

@ -1,8 +0,0 @@
package org.jackhuang.hmcl.util.logging;
/**
* @author Glavo
*/
public enum Level {
ERROR, WARNING, INFO, DEBUG, TRACE
}

43
HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/LogEvent.java
View File

@ -1,3 +1,20 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.util.logging;
import java.io.IOException;
@ -7,24 +24,16 @@ import java.util.concurrent.CountDownLatch;
/**
* @author Glavo
*/
abstract class LogEvent {
static final class DoLog extends LogEvent {
final long time;
final String caller;
final Level level;
final String message;
final Throwable exception;
DoLog(long time, String caller, Level level, String message, Throwable exception) {
this.time = time;
this.caller = caller;
this.level = level;
this.message = message;
this.exception = exception;
}
sealed interface LogEvent {
record DoLog(long time,
String caller,
System.Logger.Level level,
String message,
Throwable exception
) implements LogEvent {
}
static final class ExportLog extends LogEvent {
final class ExportLog implements LogEvent {
final CountDownLatch latch = new CountDownLatch(1);
final OutputStream output;
@ -39,6 +48,6 @@ abstract class LogEvent {
}
}
static final class Shutdown extends LogEvent {
final class Shutdown implements LogEvent {
}
}

48
HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Logger.java
View File

@ -23,6 +23,7 @@ import org.tukaani.xz.LZMA2Options;
import org.tukaani.xz.XZOutputStream;
import java.io.*;
import java.lang.System.Logger.Level;
import java.nio.file.*;
import java.time.Instant;
import java.time.LocalDateTime;
@ -86,26 +87,26 @@ public final class Logger {
StringBuilder builder = this.builder;
builder.setLength(0);
builder.append('[');
TIME_FORMATTER.formatTo(Instant.ofEpochMilli(event.time), builder);
TIME_FORMATTER.formatTo(Instant.ofEpochMilli(event.time()), builder);
builder.append("] [");
if (event.caller != null && event.caller.startsWith(PACKAGE_PREFIX)) {
builder.append("@.").append(event.caller, PACKAGE_PREFIX.length(), event.caller.length());
if (event.caller() != null && event.caller().startsWith(PACKAGE_PREFIX)) {
builder.append("@.").append(event.caller(), PACKAGE_PREFIX.length(), event.caller().length());
} else {
builder.append(event.caller);
builder.append(event.caller());
}
builder.append('/')
.append(event.level)
.append(event.level())
.append("] ")
.append(filterForbiddenToken(event.message));
.append(filterForbiddenToken(event.message()));
return builder.toString();
}
private void handle(LogEvent event) {
if (event instanceof LogEvent.DoLog) {
String log = format((LogEvent.DoLog) event);
Throwable exception = ((LogEvent.DoLog) event).exception;
if (event instanceof LogEvent.DoLog doLog) {
String log = format(doLog);
Throwable exception = doLog.exception();
System.out.println(log);
if (exception != null)
@ -114,8 +115,7 @@ public final class Logger {
logWriter.println(log);
if (exception != null)
exception.printStackTrace(logWriter);
} else if (event instanceof LogEvent.ExportLog) {
LogEvent.ExportLog exportEvent = (LogEvent.ExportLog) event;
} else if (event instanceof LogEvent.ExportLog exportEvent) {
logWriter.flush();
try {
if (logFile != null) {
@ -368,7 +368,9 @@ public final class Logger {
log(Level.TRACE, CallerFinder.getCaller(), msg, exception);
}
private static final class LogFile implements Comparable<LogFile> {
private record LogFile(Path file,
int year, int month, int day, int hour, int minute, int second,
int n) implements Comparable<LogFile> {
private static final Pattern FILE_NAME_PATTERN = Pattern.compile("(?<year>\\d{4})-(?<month>\\d{2})-(?<day>\\d{2})T(?<hour>\\d{2})-(?<minute>\\d{2})-(?<second>\\d{2})(\\.(?<n>\\d+))?\\.log(\\.(gz|xz))?");
private static @Nullable LogFile ofFile(Path file) {
@ -390,26 +392,6 @@ public final class Logger {
return new LogFile(file, year, month, day, hour, minute, second, n);
}
private final Path file;
private final int year;
private final int month;
private final int day;
private final int hour;
private final int minute;
private final int second;
private final int n;
private LogFile(Path file, int year, int month, int day, int hour, int minute, int second, int n) {
this.file = file;
this.year = year;
this.month = month;
this.day = day;
this.hour = hour;
this.minute = minute;
this.second = second;
this.n = n;
}
@Override
public int compareTo(@NotNull Logger.LogFile that) {
if (this.year != that.year) return Integer.compare(this.year, that.year);
@ -429,7 +411,7 @@ public final class Logger {
@Override
public boolean equals(Object obj) {
return obj instanceof LogFile && compareTo((LogFile) obj) == 0;
return obj instanceof LogFile that && compareTo(that) == 0;
}
}
}