Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable Metrics

This commit is contained in:
Jamie Mansfield 2018-07-22 17:40:31 +01:00
parent 99bc9a7029
commit f6788a0886
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
27 changed files with 336 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 671c4d13418b765a720726f342fa9ecdf7edf90b
Subproject commit c9f22868b3dfc6e42ad19185e1eb515c5c227723

2
BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From b7409af0d80b3f677a4ece5a33f51db79176d338 Mon Sep 17 00:00:00 2001
From f1112af6ff635230023c76474d4d7bfe9bcb4ad6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall

23
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From 65dbbad1432589ac589cc7bbe64260a2c5443d19 Mon Sep 17 00:00:00 2001
From b1daa760c06c5e706ae3bc34a67b2f646ed6b047 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
@ -20,19 +20,17 @@ index edd82c1e..b30541be 100644
}
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
new file mode 100644
index 00000000..f9e277dc
index 00000000..741ebfde
--- /dev/null
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -0,0 +1,18 @@
@@ -0,0 +1,17 @@
+package io.github.waterfallmc.waterfall.conf;
+
+import lombok.*;
+
+import java.io.File;
+
+import net.md_5.bungee.conf.Configuration;
+import net.md_5.bungee.conf.YamlConfig;
+
+import java.io.File;
+
+public class WaterfallConfiguration extends Configuration {
+
+ @Override
@ -41,6 +39,7 @@ index 00000000..f9e277dc
+ YamlConfig config = new YamlConfig(new File("waterfall.yml"));
+ config.load(false); // Load, but no permissions
+ }
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 71f30980..084bc11e 100644
@ -98,18 +97,18 @@ index 95590b6d..1019c307 100644
DumperOptions options = new DumperOptions();
options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
yaml = new Yaml( options );
@@ -55,6 +60,11 @@ public class YamlConfig implements ConfigurationAdapter
@@ -54,6 +59,11 @@ public class YamlConfig implements ConfigurationAdapter
@Override
public void load()
{
+ {
+ load(true);
+ }
+
+ public void load(boolean doPermissions)
+ {
{
try
{
file.createNewFile();
@@ -82,6 +92,7 @@ public class YamlConfig implements ConfigurationAdapter
throw new RuntimeException( "Could not load configuration!", ex );
}
@ -119,5 +118,5 @@ index 95590b6d..1019c307 100644
if ( permissions.isEmpty() )
{
--
2.13.2.windows.1
2.18.0

86
BungeeCord-Patches/0005-Configurable-Waterfall-Metrics.patch
View File

@ -1,86 +0,0 @@
From c5b9db7ce59d9034060925262a9947b141442d35 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Configurable Waterfall Metrics
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index b30541be..293ec4e3 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -84,4 +84,8 @@ public interface ProxyConfig
// Waterfall Options
//
+ /**
+ * If metrics is enabled
+ */
+ boolean isMetrics();
}
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index f9e277dc..056b8040 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -9,10 +9,23 @@ import net.md_5.bungee.conf.YamlConfig;
public class WaterfallConfiguration extends Configuration {
+ /**
+ * If metrics is enabled
+ * <p>
+ * Default is true (enabled)
+ */
+ private boolean metrics = true;
+
@Override
public void load() {
super.load();
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
+ metrics = config.getBoolean("metrics", metrics);
+ }
+
+ @Override
+ public boolean isMetrics() {
+ return metrics;
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 084bc11e..e62b5259 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -298,7 +298,9 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
- metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
+ if (config.isMetrics()) {
+ metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
+ }
}
public void startListeners()
diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
index 95239878..e482e98c 100644
--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
+++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java
@@ -9,6 +9,7 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.util.TimerTask;
+
import net.md_5.bungee.api.ProxyServer;
public class Metrics extends TimerTask
@@ -71,7 +72,7 @@ public class Metrics extends TimerTask
}
// Create the url
- URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "BungeeCord" ) ) );
+ URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "Waterfall" ) ) );
// Connect to the website
URLConnection connection;
--
2.18.0

176
BungeeCord-Patches/0005-Disable-Metrics.patch Normal file
View File

@ -0,0 +1,176 @@
From a4c060f03113dd6ae08b86396f80f65f716fcd63 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 084bc11e..b27aa939 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
* locations.yml save thread.
*/
private final Timer saveThread = new Timer( "Reconnect Saver" );
- private final Timer metricsThread = new Timer( "Metrics Thread" );
+ // private final Timer metricsThread = new Timer( "Metrics Thread" ); // Waterfall: Disable Metrics
/**
* Server socket listener.
*/
@@ -298,7 +298,7 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
- metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
+ // metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) ); // Waterfall: Disable Metrics
}
public void startListeners()
@@ -424,7 +424,7 @@ public class BungeeCord extends ProxyServer
reconnectHandler.close();
}
saveThread.cancel();
- metricsThread.cancel();
+ // metricsThread.cancel(); // Waterfall: Disable Metrics
// TODO: Fix this shit
getLogger().info( "Disabling plugins" );
diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
deleted file mode 100644
index a7ce8d82..00000000
--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package net.md_5.bungee;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.TimerTask;
-import net.md_5.bungee.api.ProxyServer;
-
-public class Metrics extends TimerTask
-{
-
- /**
- * The current revision number
- */
- private final static int REVISION = 5;
- /**
- * The base url of the metrics domain
- */
- private static final String BASE_URL = "https://mcstats.spigotmc.org";
- /**
- * The url used to report a server's status
- */
- private static final String REPORT_URL = "/report/%s";
- /**
- * Interval of time to ping (in minutes)
- */
- final static int PING_INTERVAL = 10;
- boolean firstPost = true;
-
- @Override
- public void run()
- {
- try
- {
- // We use the inverse of firstPost because if it is the first time we are posting,
- // it is not a interval ping, so it evaluates to FALSE
- // Each time thereafter it will evaluate to TRUE, i.e PING!
- postPlugin( !firstPost );
-
- // After the first post we set firstPost to false
- // Each post thereafter will be a ping
- firstPost = false;
- } catch ( IOException ex )
- {
- // ProxyServer.getInstance().getLogger().info( "[Metrics] " + ex.getMessage() );
- }
- }
-
- /**
- * Generic method that posts a plugin to the metrics website
- */
- private void postPlugin(boolean isPing) throws IOException
- {
- // Construct the post data
- final StringBuilder data = new StringBuilder();
- data.append( encode( "guid" ) ).append( '=' ).append( encode( BungeeCord.getInstance().config.getUuid() ) );
- encodeDataPair( data, "version", ProxyServer.getInstance().getVersion() );
- encodeDataPair( data, "server", "0" );
- encodeDataPair( data, "players", Integer.toString( ProxyServer.getInstance().getOnlineCount() ) );
- encodeDataPair( data, "revision", String.valueOf( REVISION ) );
-
- // If we're pinging, append it
- if ( isPing )
- {
- encodeDataPair( data, "ping", "true" );
- }
-
- // Create the url
- URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "BungeeCord" ) ) );
-
- // Connect to the website
- URLConnection connection;
-
- connection = url.openConnection();
-
- connection.setDoOutput( true );
- final BufferedReader reader;
- final String response;
- try ( OutputStreamWriter writer = new OutputStreamWriter( connection.getOutputStream() ) )
- {
- writer.write( data.toString() );
- writer.flush();
- reader = new BufferedReader( new InputStreamReader( connection.getInputStream() ) );
- response = reader.readLine();
- }
- reader.close();
-
- if ( response == null || response.startsWith( "ERR" ) )
- {
- throw new IOException( response ); //Throw the exception
- }
- }
-
- /**
- * <p>
- * Encode a key/value data pair to be used in a HTTP post request. This
- * INCLUDES a & so the first key/value pair MUST be included manually,
- * e.g:</p>
- * <code>
- * StringBuffer data = new StringBuffer();
- * data.append(encode("guid")).append('=').append(encode(guid));
- * encodeDataPair(data, "version", description.getVersion());
- * </code>
- *
- * @param buffer the StringBuilder to append the data pair onto
- * @param key the key value
- * @param value the value
- */
- private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException
- {
- buffer.append( '&' ).append( encode( key ) ).append( '=' ).append( encode( value ) );
- }
-
- /**
- * Encode text as UTF-8
- *
- * @param text the text to encode
- * @return the encoded text, as UTF-8
- */
- private static String encode(final String text) throws UnsupportedEncodingException
- {
- return URLEncoder.encode( text, "UTF-8" );
- }
-}
--
2.18.0

2
BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch
View File

@ -1,4 +1,4 @@
From 0e2432374ec4026626da426fcbb25775cc210f2b Mon Sep 17 00:00:00 2001
From 5dd2cfc7123b90e96b0c3023c5f0202b1b4b5bf2 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall CI

4
BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
View File

@ -1,4 +1,4 @@
From bb7ee77598b1180be1dcb7b62de86575adb33945 Mon Sep 17 00:00:00 2001
From 9eae8e8fc923baa334e53d6ad6934a6f85ef2c69 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager.
@ -6,7 +6,7 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index e62b5259..8a4f747c 100644
index b27aa939..4a13910e 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer

2
BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch
View File

@ -1,4 +1,4 @@
From b63cad3390214498b8d14ecf0ffc07999144b79a Mon Sep 17 00:00:00 2001
From 716366fa0881650256d344ca93b784ba7b64ffd2 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 13 Apr 2016 15:17:05 -0400
Subject: [PATCH] Presize the HTTP response buffer

4
BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From 2231ab609209a89a4bf6de54dd056c7a03023144 Mon Sep 17 00:00:00 2001
From fe62110e228d96e03bb71aafdf33d365c5c658d0 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -56,7 +56,7 @@ index d81cda98..29245c94 100644
user.setDimension( login.getDimension() );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 842425bb..51c78e2e 100644
index 8f6f5c0f..03794435 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -242,7 +242,7 @@ public class DownstreamBridge extends PacketHandler

2
BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch
View File

@ -1,4 +1,4 @@
From e4b0f0e607b748017b49277706edb780eeb3e3aa Mon Sep 17 00:00:00 2001
From d66b4b15d05ce1243e66a8b29f5c0615d11fa9e5 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files

2
BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 8c2f45e6976fe1f2d39feba80d53c9d549d37d89 Mon Sep 17 00:00:00 2001
From 272dccac1fcd101f7becdca0c0fadc475bf3179b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions

2
BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From dff2e0db54091955c1e33713b225976aa61c301b Mon Sep 17 00:00:00 2001
From 2bd2c436d0fedff5db69ee0b23a24b632d983cc2 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled

2
BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
View File

@ -1,4 +1,4 @@
From 931687f8e28ae05e4d466b400a89a5267b99f54a Mon Sep 17 00:00:00 2001
From dfb97309650f32fc56b84f26794df8d777997aa1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API

6
BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
View File

@ -1,14 +1,14 @@
From 07e5461a783493e3a46d1d1ea50a59d81cfde264 Mon Sep 17 00:00:00 2001
From fe70e9d094374aec9039f82b7cbb4871473b121f Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 8a4f747c..cfc3991f 100644
index 4a13910e..9f11f0a2 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -328,6 +328,8 @@ public class BungeeCord extends ProxyServer
@@ -326,6 +326,8 @@ public class BungeeCord extends ProxyServer
new ServerBootstrap()
.channel( PipelineUtils.getServerChannel() )
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!

2
BungeeCord-Patches/0015-Allow-removing-servers-or-changing-addresses-on-relo.patch
View File

@ -1,4 +1,4 @@
From 7906a1d4ebe578341401e2d69f5195d823615a5b Mon Sep 17 00:00:00 2001
From 4e397d65f36bf4aa15751def599df42e199d5288 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload

8
BungeeCord-Patches/0017-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From f9d8e2001b806c727b0a5e7f38af82eef3c1afc3 Mon Sep 17 00:00:00 2001
From 28305f3135034bed7b018d393e778a1c41873ee9 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -31,10 +31,10 @@ index 096538a7..54a65155 100644
if ( split.length == 0 )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index cfc3991f..ae8fd627 100644
index 9f11f0a2..c8d1d225 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -520,7 +520,9 @@ public class BungeeCord extends ProxyServer
@@ -518,7 +518,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>";
try
{
@ -59,7 +59,7 @@ index 2daaf999..bc1227a5 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 51c78e2e..23417849 100644
index 03794435..a130f581 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -224,7 +224,6 @@ public class DownstreamBridge extends PacketHandler

8
BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From c0d400a1b6b564cb5e9f6bb28b4477f0f94ea24f Mon Sep 17 00:00:00 2001
From 3a1e84a28f704518a635c4fa16c51c2693250976 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -49,12 +49,12 @@ index 9509f8ee..60de276e 100644
+ }
+
public final DefinedPacket createPacket(int id, int version)
{
+ {
+ return createPacket(id, version, true);
+ }
+
+ public final DefinedPacket createPacket(int id, int version, boolean supportsForge)
+ {
{
ProtocolData protocolData = getProtocolData( version );
if ( protocolData == null )
{
@ -122,5 +122,5 @@ index cae566f5..bad9773b 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.13.2.windows.1
2.18.0

32
BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,18 +1,17 @@
From c3cca595f8c86af85843ed663940153613687325 Mon Sep 17 00:00:00 2001
From 1b9854df997c47a99ce7dd05f5023f132629d0d2 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 293ec4e3..66d0b8a1 100644
index b30541be..3750dc59 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -88,4 +88,13 @@ public interface ProxyConfig
* If metrics is enabled
*/
boolean isMetrics();
+
@@ -84,4 +84,12 @@ public interface ProxyConfig
// Waterfall Options
//
+ // Throttling options
+
+ /**
@ -23,12 +22,12 @@ index 293ec4e3..66d0b8a1 100644
+ int getTabThrottle();
}
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index 056b8040..e56d3591 100644
index 741ebfde..0abb4075 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -16,16 +16,36 @@ public class WaterfallConfiguration extends Configuration {
*/
private boolean metrics = true;
@@ -7,11 +7,31 @@ import java.io.File;
public class WaterfallConfiguration extends Configuration {
+ /*
+ * Throttling options
@ -48,20 +47,15 @@ index 056b8040..e56d3591 100644
super.load();
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
metrics = config.getBoolean("metrics", metrics);
+ // Throttling options
+ tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
}
@Override
public boolean isMetrics() {
return metrics;
}
+ }
+
+ @Override
+ public int getTabThrottle() {
+ return tabThrottle;
+ }
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 99933dc8..af1c7deb 100644

37
BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 733b1ebe4e400014e1f72c90ba40399a4bd95b45 Mon Sep 17 00:00:00 2001
From 3016f993123866d4713b124ed8ed261192ef7188 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -9,12 +9,12 @@ This avoids spamming the logs with connection notices.
Server list pings are only logged if the log_server_list_pings config.yml option is true, defaults to false
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 66d0b8a1..5a49050a 100644
index 3750dc59..7fd5c8e5 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -89,6 +89,11 @@ public interface ProxyConfig
*/
boolean isMetrics();
@@ -84,6 +84,11 @@ public interface ProxyConfig
// Waterfall Options
//
+ /**
+ * Whether we log server list pings
@ -25,12 +25,12 @@ index 66d0b8a1..5a49050a 100644
/**
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index e56d3591..68f25460 100644
index 0abb4075..93f47511 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -16,6 +16,13 @@ public class WaterfallConfiguration extends Configuration {
*/
private boolean metrics = true;
@@ -7,6 +7,13 @@ import java.io.File;
public class WaterfallConfiguration extends Configuration {
+ /**
+ * Whether we log server list pings
@ -42,24 +42,23 @@ index e56d3591..68f25460 100644
/*
* Throttling options
* Helps prevent players from overloading the servers behind us
@@ -35,6 +42,7 @@ public class WaterfallConfiguration extends Configuration {
@@ -25,10 +32,16 @@ public class WaterfallConfiguration extends Configuration {
super.load();
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
metrics = config.getBoolean("metrics", metrics);
+ logServerListPing = config.getBoolean( "log_server_list_ping", logServerListPing );
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
}
@@ -48,4 +56,9 @@ public class WaterfallConfiguration extends Configuration {
public int getTabThrottle() {
return tabThrottle;
}
+
+ @Override
+ public boolean isLogServerListPing() {
+ return logServerListPing;
+ }
}
+
@Override
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 44821171..47904de1 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@ -73,10 +72,10 @@ index 44821171..47904de1 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 23417849..b5a4a929 100644
index a130f581..34ca5554 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -518,6 +518,6 @@ public class DownstreamBridge extends PacketHandler
@@ -529,6 +529,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{

10
BungeeCord-Patches/0024-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From cc5770bd00488d5f1834287b8067202c2faeea2d Mon Sep 17 00:00:00 2001
From e8793807bf47e8438d586770d5f4316450da1fa7 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index ae8fd627..ebcc37c2 100644
index c8d1d225..2d967df3 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@ -30,7 +30,7 @@ index ae8fd627..ebcc37c2 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -332,7 +333,7 @@ public class BungeeCord extends ProxyServer
@@ -330,7 +331,7 @@ public class BungeeCord extends ProxyServer
.childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index ae8fd627..ebcc37c2 100644
.localAddress( info.getHost() )
.bind().addListener( listener );
@@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
@@ -351,7 +352,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index ae8fd627..ebcc37c2 100644
}
}
}
@@ -448,12 +449,14 @@ public class BungeeCord extends ProxyServer
@@ -446,12 +447,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );

8
BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From c77fc4bf6ab9075ea81a378ee0bbb1d8ab2eeef6 Mon Sep 17 00:00:00 2001
From 589d0a85ce8de898b23f906bcceff3bb2ee05ed2 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -8,7 +8,7 @@ The provided methods will not move a player if a server is removed or the server
Thanks to Overcast for the idea
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 5a49050a..f04e2bf4 100644
index 7fd5c8e5..dcd46f4a 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -32,9 +32,83 @@ public interface ProxyConfig
@ -157,10 +157,10 @@ index 416c54e3..920b9b36 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index ebcc37c2..d347d42d 100644
index 2d967df3..628b5b48 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -596,10 +596,18 @@ public class BungeeCord extends ProxyServer
@@ -594,10 +594,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}

12
BungeeCord-Patches/0030-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From a3f0e2092f693b692659a90b30c7e39bdeee692a Mon Sep 17 00:00:00 2001
From 9659a1dbc694174a96732c6a3e46ff7507f7e343 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -44,12 +44,12 @@ index 0e1ef5c4..ee63732d 100644
+ // Waterfall start
+ @Deprecated
public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state)
{
+ {
+ this( player, kickedFrom, kickReasonComponent, cancelServer, state, Cause.UNKNOWN );
+ }
+
+ public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state, Cause cause)
+ {
{
this.player = player;
this.kickedFrom = kickedFrom;
this.kickReasonComponent = kickReasonComponent;
@ -75,7 +75,7 @@ index 47904de1..0937c39d 100644
{
// Pre cancel the event if we are going to try another server
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index b5a4a929..921605ab 100644
index 34ca5554..53c2a5cd 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -132,7 +132,7 @@ index b5a4a929..921605ab 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -456,7 +472,11 @@ public class DownstreamBridge extends PacketHandler
@@ -467,7 +483,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -146,5 +146,5 @@ index b5a4a929..921605ab 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.13.2.windows.1
2.18.0

41
BungeeCord-Patches/0031-Configurable-server-version-in-ping-response.patch
View File

@ -1,14 +1,14 @@
From 59052ad260158fbdccb46608001c9222759fdd31 Mon Sep 17 00:00:00 2001
From eb68d4ca73a83126a121f75f3fb9ae946c75c3b6 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index f04e2bf4..a4436141 100644
index dcd46f4a..d3411929 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -168,6 +168,11 @@ public interface ProxyConfig
@@ -163,6 +163,11 @@ public interface ProxyConfig
*/
boolean isLogServerListPing();
@ -21,48 +21,57 @@ index f04e2bf4..a4436141 100644
/**
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index 68f25460..59835815 100644
index 93f47511..15274156 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -4,8 +4,11 @@ import lombok.*;
import java.io.File;
@@ -1,7 +1,9 @@
package io.github.waterfallmc.waterfall.conf;
+import com.google.common.base.Joiner;
+
import net.md_5.bungee.conf.Configuration;
import net.md_5.bungee.conf.YamlConfig;
+import net.md_5.bungee.protocol.ProtocolConstants;
public class WaterfallConfiguration extends Configuration {
import java.io.File;
@@ -23,6 +26,13 @@ public class WaterfallConfiguration extends Configuration {
@@ -14,6 +16,12 @@ public class WaterfallConfiguration extends Configuration {
*/
private boolean logServerListPing = false;
+ /**
+ * The supported versions displayed to the client
+ * <p>Default is a comma seperated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
+ * <p>Default is a comma separated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
+ */
+ @Getter
+ private String gameVersion;
+
/*
* Throttling options
* Helps prevent players from overloading the servers behind us
@@ -45,6 +55,7 @@ public class WaterfallConfiguration extends Configuration {
@@ -33,6 +41,7 @@ public class WaterfallConfiguration extends Configuration {
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
logServerListPing = config.getBoolean( "log_server_list_ping", logServerListPing );
+ gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
+ gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
}
@@ -42,6 +51,11 @@ public class WaterfallConfiguration extends Configuration {
return logServerListPing;
}
+ @Override
+ public String getGameVersion() {
+ return gameVersion;
+ }
+
@Override
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index d347d42d..09d53fea 100644
index 628b5b48..84c7903b 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
@@ -648,7 +648,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{

8
BungeeCord-Patches/0035-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From bcb50a65f02e87abccf39b2cdb1c4ae072307838 Mon Sep 17 00:00:00 2001
From c372943d2fdcb9c5f8249a3b3fe1aa3efd1660fa Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -32,7 +32,7 @@ index 93f324e2..0e81b43c 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 18081eab..a8ac332a 100644
index 60de276e..8e40682c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@ -190,7 +190,7 @@ index 8344a9b6..ef12a019 100644
@Getter
private String displayName;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 921605ab..287a42bd 100644
index 53c2a5cd..6f847e1d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -33,6 +33,8 @@ import net.md_5.bungee.protocol.DefinedPacket;
@ -202,7 +202,7 @@ index 921605ab..287a42bd 100644
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.PlayerListItem;
import net.md_5.bungee.protocol.packet.Respawn;
@@ -529,6 +531,32 @@ public class DownstreamBridge extends PacketHandler
@@ -540,6 +542,32 @@ public class DownstreamBridge extends PacketHandler
}
}

31
BungeeCord-Patches/0036-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From b1095694b758fd1453d0e1ca679f219a25544987 Mon Sep 17 00:00:00 2001
From d36da51f0de2a4f34dce13c5a57731c66ab1b40f Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -6,10 +6,10 @@ Subject: [PATCH] Optionally use async Netty DNS resolver
We no longer need to cache the address for the session server now.
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index a4436141..43519ce1 100644
index d3411929..6187d6f0 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -173,6 +173,11 @@ public interface ProxyConfig
@@ -168,6 +168,11 @@ public interface ProxyConfig
*/
String getGameVersion();
@ -41,31 +41,42 @@ index 841f014e..2efeaa9e 100644
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index 59835815..7dc3c2d9 100644
index 15274156..5c92768a 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -33,6 +33,13 @@ public class WaterfallConfiguration extends Configuration {
@Getter
@@ -22,6 +22,12 @@ public class WaterfallConfiguration extends Configuration {
*/
private String gameVersion;
+ /**
+ * Whether we use Netty's async DNS resolver for the HttpClient.
+ * <p>Default is true (use Netty's async DNS resolver)</p>
+ */
+ @Getter
+ private boolean useNettyDnsResolver = true;
+
/*
* Throttling options
* Helps prevent players from overloading the servers behind us
@@ -56,6 +63,7 @@ public class WaterfallConfiguration extends Configuration {
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
@@ -42,6 +48,7 @@ public class WaterfallConfiguration extends Configuration {
config.load(false); // Load, but no permissions
logServerListPing = config.getBoolean( "log_server_list_ping", logServerListPing );
gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
+ useNettyDnsResolver = config.getBoolean("use_netty_dns_resolver", useNettyDnsResolver);
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
}
@@ -56,6 +63,11 @@ public class WaterfallConfiguration extends Configuration {
return gameVersion;
}
+ @Override
+ public boolean isUseNettyDnsResolver() {
+ return useNettyDnsResolver;
+ }
+
@Override
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
index 2feb4d66..b265bb43 100644
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java

12
BungeeCord-Patches/0042-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,4 +1,4 @@
From 8385fbfbe798dab73f17bd3ffaef40a1be90399a Mon Sep 17 00:00:00 2001
From 5c3e187b7e797dd0d8b20dac1f1007af795ecf03 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
@ -42,19 +42,19 @@ diff --git a/log4j/pom.xml b/log4j/pom.xml
index 36fceb93..a085a39c 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -39,6 +39,12 @@
@@ -38,6 +38,12 @@
<artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.4.2</version>
--
2.13.2.windows.1
2.18.0

44
BungeeCord-Patches/0046-Optionally-log-InitialHandler-connections.patch
View File

@ -1,61 +1,63 @@
From ed00bc1b36619e56d2df86e68f37be022f79e849 Mon Sep 17 00:00:00 2001
From 2d00fa974c95d7e2cffaebfe40f937b41883f5c7 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 43519ce1..2631d6bb 100644
index 6187d6f0..8a9c3c17 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -169,6 +169,11 @@ public interface ProxyConfig
@@ -163,6 +163,11 @@ public interface ProxyConfig
*/
boolean isLogServerListPing();
/**
+ /**
+ * Whether we log InitialHandler connections
+ */
+ boolean isLogInitialHandlerConnections();
+
+ /**
/**
* The supported versions
*/
String getGameVersion();
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index 7dc3c2d9..5ba15771 100644
index 5c92768a..090c550b 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -27,6 +27,13 @@ public class WaterfallConfiguration extends Configuration {
@@ -16,6 +16,13 @@ public class WaterfallConfiguration extends Configuration {
*/
private boolean logServerListPing = false;
/**
+ /**
+ * Whether we log InitialHandler connections
+ * <p>
+ * Default is true
+ */
+ private boolean logInitialHandlerConnections = true;
+
+ /**
/**
* The supported versions displayed to the client
* <p>Default is a comma seperated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
*/
@@ -60,6 +67,7 @@ public class WaterfallConfiguration extends Configuration {
* <p>Default is a comma separated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
@@ -47,6 +54,7 @@ public class WaterfallConfiguration extends Configuration {
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
metrics = config.getBoolean("metrics", metrics);
logServerListPing = config.getBoolean( "log_server_list_ping", logServerListPing );
+ logInitialHandlerConnections = config.getBoolean( "log_initial_handler_connections", logInitialHandlerConnections );
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
@@ -80,4 +88,9 @@ public class WaterfallConfiguration extends Configuration {
public boolean isLogServerListPing() {
useNettyDnsResolver = config.getBoolean("use_netty_dns_resolver", useNettyDnsResolver);
// Throttling options
@@ -58,6 +66,11 @@ public class WaterfallConfiguration extends Configuration {
return logServerListPing;
}
+
+ @Override
+ public boolean isLogInitialHandlerConnections() {
+ return logInitialHandlerConnections;
+ }
}
+
@Override
public String getGameVersion() {
return gameVersion;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 2347654c..c6e109c5 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@ -72,5 +74,5 @@ index 2347654c..c6e109c5 100644
ch.setProtocol( Protocol.LOGIN );
--
2.13.2.windows.1
2.18.0