From 267da46050f970e422dc53aba0f1ca2de2e0b6eb Mon Sep 17 00:00:00 2001 From: Burning_TNT Date: Wed, 21 May 2025 00:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=97=A5=E5=BF=97=20caller=20?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=20'org.jackhuang.hmcl.'=20?= =?UTF-8?q?=E7=BC=A9=E7=9F=AD=E4=B8=BA=20'@.'=20(#3919)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Shorten 'org.jackhuang.hmcl.' in logs to @. --------- Co-authored-by: Glavo --- .../org/jackhuang/hmcl/util/logging/Logger.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Logger.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Logger.java index 0fe72dadc..1a839410c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Logger.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/Logger.java @@ -42,7 +42,7 @@ public final class Logger { return message; } - + static final String PACKAGE_PREFIX = "org.jackhuang.hmcl."; static final String CLASS_NAME = Logger.class.getName(); private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -69,9 +69,15 @@ public final class Logger { builder.setLength(0); builder.append('['); TIME_FORMATTER.formatTo(Instant.ofEpochMilli(event.time), builder); - builder.append("] [") - .append(event.caller) - .append('/') + builder.append("] ["); + + 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('/') .append(event.level) .append("] ") .append(filterForbiddenToken(event.message));