mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 22:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

update logging

Browse Source
This commit is contained in:
dfsek
2021-11-21 17:39:03 -07:00
parent 323d58aeb0
commit 3b07aece86
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java
+7 -1
View File
@@ -20,6 +20,9 @@ import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.inject.Injector; import com.dfsek.terra.api.inject.Injector;
import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.inject.annotations.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ManifestAddon implements BaseAddon { public class ManifestAddon implements BaseAddon {
private final AddonManifest manifest; private final AddonManifest manifest;
@@ -29,6 +32,8 @@ public class ManifestAddon implements BaseAddon {
@Inject @Inject
private Platform platform; private Platform platform;
private static final Logger LOGGER = LoggerFactory.getLogger(ManifestAddon.class);
public ManifestAddon(AddonManifest manifest, List<AddonInitializer> initializers) { public ManifestAddon(AddonManifest manifest, List<AddonInitializer> initializers) {
this.manifest = manifest; this.manifest = manifest;
this.initializers = initializers; this.initializers = initializers;
@@ -46,9 +51,10 @@ public class ManifestAddon implements BaseAddon {
Injector<Platform> platformInjector = Injector.get(platform); Injector<Platform> platformInjector = Injector.get(platform);
platformInjector.addExplicitTarget(Platform.class); platformInjector.addExplicitTarget(Platform.class);
platform.logger().info("Initializing addon " + getID()); LOGGER.info("Initializing addon " + getID());
initializers.forEach(initializer -> { initializers.forEach(initializer -> {
LOGGER.debug("Invoking entry point {}", initializer.getClass());
addonInjector.inject(initializer); addonInjector.inject(initializer);
platformInjector.inject(initializer); platformInjector.inject(initializer);
initializer.initialize(); initializer.initialize();
common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java
+7 -5
View File
@@ -36,16 +36,18 @@ import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.inject.annotations.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> { public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
@Inject private static final Logger LOGGER = LoggerFactory.getLogger(ManifestAddonLoader.class);
private Platform platform;
private static final Version VERSION = Versions.getVersion(1, 0, 0); private static final Version VERSION = Versions.getVersion(1, 0, 0);
@Override @Override
public Iterable<ManifestAddon> loadAddons(Path addonsFolder, ClassLoader parent) { public Iterable<ManifestAddon> loadAddons(Path addonsFolder, ClassLoader parent) {
platform.logger().info("Loading addons..."); LOGGER.info("Loading addons...");
ConfigLoader manifestLoader = new ConfigLoader(); ConfigLoader manifestLoader = new ConfigLoader();
manifestLoader.registerLoader(Version.class, new VersionLoader()) manifestLoader.registerLoader(Version.class, new VersionLoader())
@@ -57,7 +59,7 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
.filter(path -> path.toFile().isFile() && path.toString().endsWith(".jar")) .filter(path -> path.toFile().isFile() && path.toString().endsWith(".jar"))
.map(path -> { .map(path -> {
try { try {
platform.getDebugLogger().info("Loading addon from JAR " + path); LOGGER.debug("Loading addon from JAR {}", path);
JarFile jar = new JarFile(path.toFile()); JarFile jar = new JarFile(path.toFile());
JarEntry manifestEntry = jar.getJarEntry("terra.addon.yml"); JarEntry manifestEntry = jar.getJarEntry("terra.addon.yml");
@@ -71,7 +73,7 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
new YamlConfiguration(jar.getInputStream(manifestEntry), new YamlConfiguration(jar.getInputStream(manifestEntry),
"terra.addon.yml")); "terra.addon.yml"));
platform.logger().info("Loading addon " + manifest.getID()); LOGGER.info("Loading addon {}", manifest.getID());
ManifestAddonClassLoader loader = new ManifestAddonClassLoader(new URL[]{ path.toUri().toURL() }, ManifestAddonClassLoader loader = new ManifestAddonClassLoader(new URL[]{ path.toUri().toURL() },
getClass().getClassLoader()); getClass().getClassLoader());