3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-12-24 15:20:35 +01:00

Allow closing active proxy listeners (#1109)

Dieser Commit ist enthalten in:
Owen 2023-10-27 01:39:03 -04:00 committet von GitHub
Ursprung b30802c1b3
Commit b33d18af2b
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 33 neuen und 8 gelöschten Zeilen

Datei anzeigen

@ -41,6 +41,12 @@ public interface ProxyServer extends Audience {
*/
void shutdown();
/**
* Closes all listening endpoints for this server.
* This includes the main minecraft listener and query channel.
*/
void closeListeners();
/**
* Retrieves the player currently connected to this proxy by their Minecraft username. The search
* is case-insensitive.

Datei anzeigen

@ -572,6 +572,11 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
shutdown(true);
}
@Override
public void closeListeners() {
this.cm.closeEndpoints(false);
}
public AsyncHttpClient getAsyncHttpClient() {
return cm.getHttpClient();
}

Datei anzeigen

@ -212,9 +212,11 @@ public final class ConnectionManager {
}
/**
* Closes all endpoints.
* Closes all the currently registered endpoints.
*
* @param interrupt should closing forward interruptions
*/
public void shutdown() {
public void closeEndpoints(boolean interrupt) {
for (final Map.Entry<InetSocketAddress, Endpoint> entry : this.endpoints.entrySet()) {
final InetSocketAddress address = entry.getKey();
final Endpoint endpoint = entry.getValue();
@ -223,14 +225,26 @@ public final class ConnectionManager {
// should have a chance to be notified before the server stops accepting connections.
server.getEventManager().fire(new ListenerCloseEvent(address, endpoint.getType())).join();
try {
LOGGER.info("Closing endpoint {}", address);
endpoint.getChannel().close().sync();
} catch (final InterruptedException e) {
LOGGER.info("Interrupted whilst closing endpoint", e);
Thread.currentThread().interrupt();
LOGGER.info("Closing endpoint {}", address);
if (interrupt) {
try {
endpoint.getChannel().close().sync();
} catch (final InterruptedException e) {
LOGGER.info("Interrupted whilst closing endpoint", e);
Thread.currentThread().interrupt();
}
} else {
endpoint.getChannel().close().syncUninterruptibly();
}
}
this.endpoints.clear();
}
/**
* Closes all endpoints.
*/
public void shutdown() {
this.closeEndpoints(true);
this.resolver.shutdown();
}