2013-07-03 00:27:18 +02:00
|
|
|
From 7f9913f4949ab5635570f2130c703cd65e8dff6d Mon Sep 17 00:00:00 2001
|
2013-06-22 08:40:34 +02:00
|
|
|
From: md_5 <md_5@live.com.au>
|
|
|
|
Date: Sat, 22 Jun 2013 16:40:11 +1000
|
|
|
|
Subject: [PATCH] Add Log Filtering
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/spigotmc/LogFilter.java b/src/main/java/org/spigotmc/LogFilter.java
|
|
|
|
new file mode 100644
|
2013-06-26 08:59:37 +02:00
|
|
|
index 0000000..aa7e9ab
|
2013-06-22 08:40:34 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/org/spigotmc/LogFilter.java
|
2013-06-26 08:59:37 +02:00
|
|
|
@@ -0,0 +1,24 @@
|
2013-06-22 08:40:34 +02:00
|
|
|
+package org.spigotmc;
|
|
|
|
+
|
|
|
|
+import java.util.logging.Filter;
|
|
|
|
+import java.util.logging.LogRecord;
|
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
+
|
|
|
|
+public class LogFilter implements Filter
|
|
|
|
+{
|
|
|
|
+
|
|
|
|
+ public boolean isLoggable(LogRecord record)
|
|
|
|
+ {
|
2013-06-26 08:59:37 +02:00
|
|
|
+ if ( record.getMessage() != null )
|
2013-06-22 08:40:34 +02:00
|
|
|
+ {
|
2013-06-26 08:59:37 +02:00
|
|
|
+ for ( Pattern pattern : SpigotConfig.logFilters )
|
2013-06-22 08:40:34 +02:00
|
|
|
+ {
|
2013-06-26 08:59:37 +02:00
|
|
|
+ if ( pattern.matcher( record.getMessage() ).matches() )
|
|
|
|
+ {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
2013-06-22 08:40:34 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
2013-07-02 07:14:02 +02:00
|
|
|
index d2058f3..e8039d7 100644
|
2013-06-22 08:40:34 +02:00
|
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
|
|
@@ -13,6 +13,8 @@ import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.logging.Level;
|
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
+import java.util.regex.PatternSyntaxException;
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
|
import org.bukkit.ChatColor;
|
2013-07-02 07:14:02 +02:00
|
|
|
@@ -255,4 +257,27 @@ public class SpigotConfig
|
2013-06-22 08:40:34 +02:00
|
|
|
unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) );
|
2013-06-23 03:06:30 +02:00
|
|
|
serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) );
|
2013-06-22 08:40:34 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public static List<Pattern> logFilters;
|
|
|
|
+ private static void filters()
|
|
|
|
+ {
|
|
|
|
+ List<String> def = Arrays.asList( new String[]
|
|
|
|
+ {
|
|
|
|
+ "^(.*)(/login)(.*)$"
|
|
|
|
+ } );
|
|
|
|
+ logFilters = new ArrayList<Pattern>();
|
|
|
|
+
|
|
|
|
+ for ( String regex : (List<String>) getList( "settings.log-filters", def ) )
|
|
|
|
+ {
|
|
|
|
+ try
|
|
|
|
+ {
|
|
|
|
+ logFilters.add( Pattern.compile( regex ) );
|
|
|
|
+ } catch ( PatternSyntaxException ex )
|
|
|
|
+ {
|
|
|
|
+ Bukkit.getLogger().log( Level.WARNING, "Supplied filter " + regex + " is invalid, ignoring!", ex );
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Bukkit.getLogger().setFilter( new LogFilter() );
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
--
|
|
|
|
1.8.1.2
|
|
|
|
|