From 177a64787833f9541e76a8feb1b8f94e4c858abc Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sun, 8 Jul 2018 15:03:09 +0800 Subject: [PATCH] add logger: launch, config --- .../authlibinjector/AuthlibInjector.java | 24 +++++++++---------- .../javaagent/AuthlibInjectorPremain.java | 8 +++---- .../yushi/authlibinjector/util/Logging.java | 2 ++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java index c809dee..b50230f 100644 --- a/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java +++ b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java @@ -68,17 +68,17 @@ public final class AuthlibInjector { public static void bootstrap(Consumer transformerRegistry) { if (!booted.compareAndSet(false, true)) { - Logging.ROOT.info("already booted, skipping"); + Logging.LAUNCH.info("already booted, skipping"); return; } - Logging.ROOT.info("version: " + getVersion()); + Logging.LAUNCH.info("version: " + getVersion()); Optional optionalConfig = configure(); if (optionalConfig.isPresent()) { transformerRegistry.accept(createTransformer(optionalConfig.get())); } else { - Logging.ROOT.warning("no config available"); + Logging.LAUNCH.warning("no config available"); } } @@ -87,7 +87,7 @@ public final class AuthlibInjector { if (prefetched == null) { prefetched = System.getProperty(PROP_PREFETCHED_DATA_OLD); if (prefetched != null) { - Logging.ROOT.warning("org.to2mbn.authlibinjector.config.prefetched option is deprecated and will be removed in a future release."); + Logging.LAUNCH.warning("org.to2mbn.authlibinjector.config.prefetched option is deprecated and will be removed in a future release."); } } return Optional.ofNullable(prefetched); @@ -96,44 +96,44 @@ public final class AuthlibInjector { private static Optional configure() { String apiRoot = System.getProperty(PROP_API_ROOT); if (apiRoot == null) return empty(); - Logging.ROOT.info("api root: " + apiRoot); + Logging.CONFIG.info("api root: " + apiRoot); String metadataResponse; Optional prefetched = getPrefetchedResponse(); if (!prefetched.isPresent()) { - Logging.ROOT.info("fetching metadata"); + Logging.CONFIG.info("fetching metadata"); try { metadataResponse = asString(getURL(apiRoot)); } catch (IOException e) { - Logging.ROOT.severe("unable to fetch metadata: " + e); + Logging.CONFIG.severe("unable to fetch metadata: " + e); throw new UncheckedIOException(e); } } else { - Logging.ROOT.info("prefetched metadata detected"); + Logging.CONFIG.info("prefetched metadata detected"); try { metadataResponse = new String(Base64.getDecoder().decode(removeNewLines(prefetched.get())), UTF_8); } catch (IllegalArgumentException e) { - Logging.ROOT.severe("unable to decode metadata: " + e + "\n" + Logging.CONFIG.severe("unable to decode metadata: " + e + "\n" + "metadata to decode:\n" + prefetched.get()); throw e; } } - Logging.ROOT.fine("metadata: " + metadataResponse); + Logging.CONFIG.fine("metadata: " + metadataResponse); YggdrasilConfiguration configuration; try { configuration = YggdrasilConfiguration.parse(apiRoot, metadataResponse); } catch (UncheckedIOException e) { - Logging.ROOT.severe("unable to parse metadata: " + e + "\n" + Logging.CONFIG.severe("unable to parse metadata: " + e + "\n" + "metadata to parse:\n" + metadataResponse); throw e; } - Logging.ROOT.fine("parsed metadata: " + configuration); + Logging.CONFIG.fine("parsed metadata: " + configuration); return of(configuration); } diff --git a/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java b/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java index 196685d..042b7ce 100644 --- a/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java +++ b/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java @@ -16,20 +16,20 @@ public class AuthlibInjectorPremain { public static void premain(String arg, Instrumentation instrumentation) { try { - Logging.ROOT.info("launched from premain"); + Logging.LAUNCH.info("launched from premain"); initInjector(arg, instrumentation, false); } catch (Throwable e) { - Logging.ROOT.log(Level.SEVERE, "an exception has been caught, exiting", e); + Logging.LAUNCH.log(Level.SEVERE, "an exception has been caught, exiting", e); System.exit(1); } } public static void agentmain(String arg, Instrumentation instrumentation) { try { - Logging.ROOT.info("launched from agentmain"); + Logging.LAUNCH.info("launched from agentmain"); initInjector(arg, instrumentation, true); } catch (Throwable e) { - Logging.ROOT.log(Level.SEVERE, "an exception has been caught", e); + Logging.LAUNCH.log(Level.SEVERE, "an exception has been caught", e); } } diff --git a/src/main/java/moe/yushi/authlibinjector/util/Logging.java b/src/main/java/moe/yushi/authlibinjector/util/Logging.java index 61329fd..a0fd8bf 100644 --- a/src/main/java/moe/yushi/authlibinjector/util/Logging.java +++ b/src/main/java/moe/yushi/authlibinjector/util/Logging.java @@ -14,6 +14,8 @@ public final class Logging { private Logging() {} public static final Logger ROOT = Logger.getLogger("moe.yushi.authlibinjector"); + public static final Logger LAUNCH = Logger.getLogger("moe.yushi.authlibinjector.launch"); + public static final Logger CONFIG = Logger.getLogger("moe.yushi.authlibinjector.config"); public static final Logger TRANSFORM = Logger.getLogger("moe.yushi.authlibinjector.transform"); public static final Logger HTTPD = Logger.getLogger("moe.yushi.authlibinjector.httpd");