SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Rename proxy-protocol setting to haproxy-protocol to make it clearer this is for HAProxy.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2021-01-06 13:29:30 -05:00
Ursprung 1f9c24566d
Commit 4df8f70156
2 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
Datei anzeigen

@ -646,7 +646,11 @@ public class VelocityConfiguration implements ProxyConfig {
this.loginRatelimit = config.getIntOrElse("login-ratelimit", 3000); this.loginRatelimit = config.getIntOrElse("login-ratelimit", 3000);
this.connectionTimeout = config.getIntOrElse("connection-timeout", 5000); this.connectionTimeout = config.getIntOrElse("connection-timeout", 5000);
this.readTimeout = config.getIntOrElse("read-timeout", 30000); this.readTimeout = config.getIntOrElse("read-timeout", 30000);
this.proxyProtocol = config.getOrElse("proxy-protocol", false); if (config.contains("haproxy-protocol")) {
this.proxyProtocol = config.getOrElse("haproxy-protocol", false);
} else {
this.proxyProtocol = config.getOrElse("proxy-protocol", false);
}
this.tcpFastOpen = config.getOrElse("tcp-fast-open", false); this.tcpFastOpen = config.getOrElse("tcp-fast-open", false);
this.bungeePluginMessageChannel = config.getOrElse("bungee-plugin-message-channel", true); this.bungeePluginMessageChannel = config.getOrElse("bungee-plugin-message-channel", true);
this.showPingRequests = config.getOrElse("show-ping-requests", false); this.showPingRequests = config.getOrElse("show-ping-requests", false);

2
proxy/src/main/resources/default-velocity.toml
Datei anzeigen

@ -106,7 +106,7 @@ connection-timeout = 5000
read-timeout = 30000 read-timeout = 30000
# Enables compatibility with HAProxy. # Enables compatibility with HAProxy.
proxy-protocol = false haproxy-protocol = false
# Enables TCP fast open support on the proxy. Requires the proxy to run on Linux. # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux.
tcp-fast-open = false tcp-fast-open = false