Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-23 18:55:22 +01:00
Code Issues Projects Releases Wiki Activity

#2753: Add configurable remote ping caching

Browse Source
This commit is contained in:
Mystiflow 2020-01-24 10:48:50 +11:00 committed by md_5
parent a4512e50fb
commit 636c020772
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
View File

@ -56,6 +56,14 @@ public interface ProxyConfig
*/
boolean isLogCommands();
/**
* Time in milliseconds to cache server list info from a ping request from
* the proxy to a server.
*
* @return cache time
*/
int getRemotePingCache();
/**
* Returns the player max.
*

24
proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
View File

@ -123,6 +123,18 @@ public class BungeeServerInfo implements ServerInfo
}
}
private long lastPing;
private ServerPing cachedPing;
public void cachePing(ServerPing serverPing)
{
if ( ProxyServer.getInstance().getConfig().getRemotePingCache() > 0 )
{
this.cachedPing = serverPing;
this.lastPing = System.currentTimeMillis();
}
}
@Override
public InetSocketAddress getAddress()
{
@ -139,6 +151,18 @@ public class BungeeServerInfo implements ServerInfo
{
Preconditions.checkNotNull( callback, "callback" );
int pingCache = ProxyServer.getInstance().getConfig().getRemotePingCache();
if ( pingCache > 0 && cachedPing != null && ( lastPing - System.currentTimeMillis() ) > pingCache )
{
cachedPing = null;
}
if ( cachedPing != null )
{
callback.done( cachedPing, null );
return;
}
ChannelFutureListener listener = new ChannelFutureListener()
{
@Override

2
proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
View File

@ -52,6 +52,7 @@ public class Configuration implements ProxyConfig
*/
private boolean logCommands;
private boolean logPings = true;
private int remotePingCache = -1;
private int playerLimit = -1;
private Collection<String> disabledCommands;
private int throttle = 4000;
@ -85,6 +86,7 @@ public class Configuration implements ProxyConfig
onlineMode = adapter.getBoolean( "online_mode", onlineMode );
logCommands = adapter.getBoolean( "log_commands", logCommands );
logPings = adapter.getBoolean( "log_pings", logPings );
remotePingCache = adapter.getInt( "remote_ping_cache", remotePingCache );
playerLimit = adapter.getInt( "player_limit", playerLimit );
throttle = adapter.getInt( "connection_throttle", throttle );
throttleLimit = adapter.getInt( "connection_throttle_limit", throttleLimit );

5
proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
View File

@ -4,6 +4,7 @@ import com.google.gson.Gson;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.BungeeServerInfo;
import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ServerPing;
@ -65,7 +66,9 @@ public class PingHandler extends PacketHandler
public void handle(StatusResponse statusResponse) throws Exception
{
Gson gson = BungeeCord.getInstance().gson;
callback.done( gson.fromJson( statusResponse.getResponse(), ServerPing.class ), null );
ServerPing serverPing = gson.fromJson( statusResponse.getResponse(), ServerPing.class );
( (BungeeServerInfo) target ).cachePing( serverPing );
callback.done( serverPing, null );
channel.close();
}