mirror of
https://github.com/yushijinhun/authlib-injector.git
synced 2024-06-02 16:48:54 +02:00
add logger: launch, config
This commit is contained in:
parent
760c90a37b
commit
177a647878
|
@ -68,17 +68,17 @@ public final class AuthlibInjector {
|
|||
|
||||
public static void bootstrap(Consumer<ClassFileTransformer> 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<YggdrasilConfiguration> 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<YggdrasilConfiguration> 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<String> 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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
Loading…
Reference in a new issue