Skip to content

Use configured timeout value in UserConnection#connect #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electronicboy merged 1 commit into from
Apr 24, 2020
Merged

Use configured timeout value in UserConnection#connect #490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fb2ee4df44963c8232471e2cef7964144697a67e Mon Sep 17 00:00:00 2001
From 90b458f4915b37108a21fcaaf2d29dabf53c4185 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
Expand Down Expand Up @@ -75,15 +75,15 @@ index 867e4428..f7459860 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 3c0c4189..3f9a91e3 100644
index 51aed6da..c270cd77 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -254,9 +254,20 @@ public final class UserConnection implements ProxiedPlayer

public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
+ // Waterfall start
+ connect(info, callback, retry, reason, 5000); // todo: configurable
+ connect(info, callback, retry, reason, bungee.getConfig().getServerConnectTimeout());
+ }
+ public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, int timeout) {
+ connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
Expand All @@ -109,5 +109,5 @@ index 3c0c4189..3f9a91e3 100644
{
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
--
2.25.0
2.26.2.windows.1