Archiviert
13
0

Fix a few issues with debug logging

Also add a warning if the updater section is missing
Dieser Commit ist enthalten in:
Dan Mulloy 2016-05-22 17:26:36 -04:00
Ursprung cc362a1b7f
Commit 402390866a
4 geänderte Dateien mit 14 neuen und 15 gelöschten Zeilen

Datei anzeigen

@ -157,6 +157,9 @@ public class ProtocolConfig {
} }
if (global != null) { if (global != null) {
updater = global.getConfigurationSection(SECTION_AUTOUPDATER); updater = global.getConfigurationSection(SECTION_AUTOUPDATER);
if (updater.getValues(true).isEmpty()) {
plugin.getLogger().warning("Updater section is missing, regenerate your config!");
}
} }
// Automatically copy defaults // Automatically copy defaults

Datei anzeigen

@ -71,7 +71,6 @@ public class ProtocolLibrary {
ProtocolLibrary.reporter = reporter; ProtocolLibrary.reporter = reporter;
ProtocolLibrary.executorAsync = executorAsync; ProtocolLibrary.executorAsync = executorAsync;
ProtocolLibrary.executorSync = executorSync; ProtocolLibrary.executorSync = executorSync;
ProtocolLogger.init(plugin);
initialized = true; initialized = true;
} }

Datei anzeigen

@ -18,7 +18,6 @@ package com.comphenix.protocol;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -26,17 +25,17 @@ import org.bukkit.plugin.Plugin;
* @author dmulloy2 * @author dmulloy2
*/ */
public class ProtocolLogger { public class ProtocolLogger {
private static Logger logger; private static Plugin plugin;
protected static void init(Plugin plugin) { protected static void init(Plugin plugin) {
ProtocolLogger.logger = plugin.getLogger(); ProtocolLogger.plugin = plugin;
} }
private static boolean isDebugEnabled() { private static boolean isDebugEnabled() {
try { try {
return ProtocolLibrary.getConfig().isDebug(); return plugin.getConfig().getBoolean("global.debug", false);
} catch (Throwable ex) { } catch (Throwable ex) { // Maybe we're testing or something
return true; // For testing return false;
} }
} }
@ -47,7 +46,7 @@ public class ProtocolLogger {
* @param args Arguments to format in * @param args Arguments to format in
*/ */
public static void log(Level level, String message, Object... args) { public static void log(Level level, String message, Object... args) {
logger.log(level, MessageFormat.format(message, args)); plugin.getLogger().log(level, MessageFormat.format(message, args));
} }
/** /**
@ -66,16 +65,12 @@ public class ProtocolLogger {
* @param ex Exception to log * @param ex Exception to log
*/ */
public static void log(Level level, String message, Throwable ex) { public static void log(Level level, String message, Throwable ex) {
logger.log(level, message, ex); plugin.getLogger().log(level, message, ex);
} }
public static void debug(String message, Object... args) { public static void debug(String message, Object... args) {
if (isDebugEnabled()) { if (isDebugEnabled()) {
if (logger != null) { log("[Debug] " + message, args);
log("[Debug] " + message, args);
} else {
System.out.println("[Debug] " + MessageFormat.format(message, args));
}
} }
} }
} }

Datei anzeigen

@ -148,8 +148,10 @@ public class ProtocolLib extends JavaPlugin {
@Override @Override
public void onLoad() { public void onLoad() {
// Load configuration // Logging
logger = getLoggerSafely(); logger = getLoggerSafely();
ProtocolLogger.init(this);
Application.registerPrimaryThread(); Application.registerPrimaryThread();
// Initialize enhancer factory // Initialize enhancer factory