From 46ccfb235d1667569f29cfaaff94ce04b1908b36 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 30 Jan 2013 20:55:12 -0500 Subject: [PATCH] More logging tweaks. You can probably configure individual mod log files if you wish now --- fml/common/cpw/mods/fml/common/LoadController.java | 7 +++++-- fml/common/cpw/mods/fml/common/Loader.java | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/LoadController.java b/fml/common/cpw/mods/fml/common/LoadController.java index 191346caf4..c9f1cb9ce5 100644 --- a/fml/common/cpw/mods/fml/common/LoadController.java +++ b/fml/common/cpw/mods/fml/common/LoadController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; +import java.util.logging.Logger; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; @@ -60,14 +61,16 @@ public class LoadController boolean isActive = mod.registerBus(bus, this); if (isActive) { - FMLLog.fine("Activating mod %s", mod.getModId()); + Level level = Logger.getLogger(mod.getModId()).getLevel(); + FMLLog.log(mod.getModId(), Level.FINE, "Mod Logging channel %s configured at %s level.", level == null ? "default" : level); + FMLLog.log(mod.getModId(), Level.INFO, "Activating mod %s", mod.getModId()); activeModList.add(mod); modStates.put(mod.getModId(), ModState.UNLOADED); eventBus.put(mod.getModId(), bus); } else { - FMLLog.warning("Mod %s has been disabled through configuration", mod.getModId()); + FMLLog.log(mod.getModId(), Level.WARNING, "Mod %s has been disabled through configuration", mod.getModId()); modStates.put(mod.getModId(), ModState.UNLOADED); modStates.put(mod.getModId(), ModState.DISABLED); } diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java index 04f4e0d831..a48a775443 100644 --- a/fml/common/cpw/mods/fml/common/Loader.java +++ b/fml/common/cpw/mods/fml/common/Loader.java @@ -497,6 +497,10 @@ public class Loader { FMLLog.fine("\t%s(%s:%s): %s (%s)", mod.getModId(), mod.getName(), mod.getVersion(), mod.getSource().getName(), CertificateHelper.getFingerprint(mod.getSigningCertificate())); } + if (getActiveModList().isEmpty()) + { + FMLLog.fine("No user mod signature data found"); + } modController.transition(LoaderState.PREINITIALIZATION); modController.distributeStateMessage(LoaderState.PREINITIALIZATION, disc.getASMTable(), canonicalConfigDir); modController.transition(LoaderState.INITIALIZATION);