From 7a7f2eb025e7349bbdcbf5c25367505011ed4fcd Mon Sep 17 00:00:00 2001 From: kshade Date: Thu, 15 Dec 2011 20:59:09 +0100 Subject: [PATCH 1/3] Added support for Minecraft.CommandBook logger (in a stupid, braindead way), updated repository URL --- pom.xml | 6 +++--- src/main/java/com/cypherx/consolefilter/ConsoleFilter.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 91341dd..b676dbf 100644 --- a/pom.xml +++ b/pom.xml @@ -14,14 +14,14 @@ true - http://artifacts.lukegb.com/artifactory/repo/ + http://repo.bukkit.org/content/groups/repo/ org.bukkit bukkit - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT jar compile @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java index 059f024..3d5d301 100644 --- a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java +++ b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java @@ -22,6 +22,7 @@ public class ConsoleFilter extends JavaPlugin { private PluginDescriptionFile desc; private File dataFolder; private Logger log; + private Logger logcb; public void onDisable() { log(Level.INFO, "v" + desc.getVersion() + " Disabled!"); @@ -35,7 +36,9 @@ public void onEnable() { dataFolder.mkdirs(); log = Logger.getLogger("Minecraft"); + logcb = Logger.getLogger("Minecraft.CommandBook"); log.setFilter(new CFFilter(loadFilter())); + logcb.setFilter(new CFFilter(loadFilter())); log(Level.INFO, "v" + desc.getVersion() + " Enabled!"); } @@ -157,4 +160,4 @@ private String getResourceAsString(String resource) { private void log(Level level, String message) { log.log(level, "[ConsoleFilter] " + message); } -} \ No newline at end of file +} From a41541d2865ee0a1b52495b482b139d93c9b00cb Mon Sep 17 00:00:00 2001 From: kshade Date: Thu, 15 Dec 2011 21:11:56 +0100 Subject: [PATCH 2/3] More extensible way to add multiple loggers, could be made to load a list of loggers from the config file. --- .../com/cypherx/consolefilter/ConsoleFilter.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java index 3d5d301..138524e 100644 --- a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java +++ b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java @@ -22,7 +22,7 @@ public class ConsoleFilter extends JavaPlugin { private PluginDescriptionFile desc; private File dataFolder; private Logger log; - private Logger logcb; + private ArrayList extraLoggers; public void onDisable() { log(Level.INFO, "v" + desc.getVersion() + " Disabled!"); @@ -36,9 +36,15 @@ public void onEnable() { dataFolder.mkdirs(); log = Logger.getLogger("Minecraft"); - logcb = Logger.getLogger("Minecraft.CommandBook"); log.setFilter(new CFFilter(loadFilter())); - logcb.setFilter(new CFFilter(loadFilter())); + + extraLoggers = new ArrayList(); + extraLoggers.add(Logger.getLogger("Minecraft.CommandBook")); + for (Logger l : extraLoggers) { + l.setFilter(new CFFilter(loadFilter())); + log(Level.INFO, "Enabling logging on extra logger " + l.getName()); + } + log(Level.INFO, "v" + desc.getVersion() + " Enabled!"); } From 5d3d34b4af63bc5ea5fb2f100ecbdad3bb95ac90 Mon Sep 17 00:00:00 2001 From: kshade Date: Thu, 15 Dec 2011 21:24:32 +0100 Subject: [PATCH 3/3] Used spaces instead of tab, oops --- pom.xml | 2 +- .../com/cypherx/consolefilter/ConsoleFilter.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b676dbf..2b6ae47 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ true - http://repo.bukkit.org/content/groups/repo/ + http://repo.bukkit.org/content/groups/repo/ diff --git a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java index 138524e..6dcaa7a 100644 --- a/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java +++ b/src/main/java/com/cypherx/consolefilter/ConsoleFilter.java @@ -22,7 +22,7 @@ public class ConsoleFilter extends JavaPlugin { private PluginDescriptionFile desc; private File dataFolder; private Logger log; - private ArrayList extraLoggers; + private ArrayList extraLoggers; public void onDisable() { log(Level.INFO, "v" + desc.getVersion() + " Disabled!"); @@ -38,12 +38,12 @@ public void onEnable() { log = Logger.getLogger("Minecraft"); log.setFilter(new CFFilter(loadFilter())); - extraLoggers = new ArrayList(); - extraLoggers.add(Logger.getLogger("Minecraft.CommandBook")); - for (Logger l : extraLoggers) { - l.setFilter(new CFFilter(loadFilter())); - log(Level.INFO, "Enabling logging on extra logger " + l.getName()); - } + extraLoggers = new ArrayList(); + extraLoggers.add(Logger.getLogger("Minecraft.CommandBook")); + for (Logger l : extraLoggers) { + l.setFilter(new CFFilter(loadFilter())); + log(Level.INFO, "Enabling logging on extra logger " + l.getName()); + } log(Level.INFO, "v" + desc.getVersion() + " Enabled!"); }