Rework disconnect logic for connectors

Rework the way disconnection at shutdown is done to properly close
the connections when the master server is shut down.
This commit is contained in:
Hornwitser committed 2020-04-09 19:50:01 +02:00
1 parent 47ea8f5477
commit 9507608e59
8 files changed
+174 -44

No files matched your search

+7
View File
@@ -87,6 +87,13 @@ MasterGroup.define({
type: "number",
initial_value: 60,
});
MasterGroup.define({
name: "connector_shutdown_timeout",
title: "Connector Shutdown Timeout",
description: "Timeout in seconds for connectors to properly disconnect on shutdown",
type: "number",
initial_value: 30,
});
MasterGroup.finalize();
class MasterConfig extends classes.Config { }
+4
View File
@@ -14,6 +14,9 @@ class InvalidMessage extends Error {
}
}
// Thrown from requests when the session it was sent on was lost.
class SessionLost extends Error { }
// Thrown when WebSocket authentication failed
class AuthenticationFailed extends Error { }
@@ -36,6 +39,7 @@ module.exports = {
CommandError,
RequestError,
InvalidMessage,
SessionLost,
AuthenticationFailed,
StartupError,
EnvironmentError,
+33 -7
View File
@@ -129,6 +129,8 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
this._sessionToken = null;
this._connected = false;
this._reconnectDelay = reconnectDelay;
this._timeout = 15 * 60;
this._startedReconnect = null;
}
_check(expectedStates) {
@@ -139,6 +141,15 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
}
}
setTimeout(timeout) {
this._timeout = timeout;
if (this._reconnectId && this.timeout < this._reconnectDelay / 2) {
clearTimeout(this._reconnectId);
this.reconnect();
}
}
/**
* Send a handshake message over the socket
*
@@ -155,7 +166,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
*
* Sends a close frame and disconnects the connector.
*/
close(code, reason) {
async close(code, reason) {
if (this._state === "new") {
return;
}
@@ -168,6 +179,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
this.stopHeartbeat();
this._state = "closing";
this._socket.close(code, reason);
await events.once(this, "close");
}
/**
@@ -207,6 +219,24 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
return;
}
if (this._startedReconnect === null) {
this._startedReconnect = Date.now();
}
if (this._startedReconnect + this._timeout * 1000 < Date.now()) {
console.log("SOCKET | Timed out trying to reconnect");
this._heartbeatInterval = null;
this._lastReceivedSeq = null;
this._sessionToken = null;
this._sendBuffer.length = 0;
if (this._connected) {
this._connected = false;
this.emit("close");
}
this.emit("invalidate");
return;
}
let delay = Math.random() * this._reconnectDelay;
console.log(`SOCKET | waiting ${delay.toLocaleString("en", { maximumFractionDigits: 2 })} seconds for reconnect`)
this._reconnectId = setTimeout(() => {
@@ -231,18 +261,14 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
this._state = "new";
if (this._connected) {
this.emit("close");
this._connected = false;
this.emit("close");
}
} else {
this._state = "handshake";
this.reconnect();
if (this._connected) {
this.emit("dropped");
this._connected = false;
}
this.emit("dropped");
}
this.stopHeartbeat();
+1 -2
View File
@@ -45,7 +45,7 @@ class Link {
connector.on("invalidate", () => {
for (let waiterType of this._waiters.values()) {
for (let waiter of waiterType) {
waiter.reject(new Error("Session lost"));
waiter.reject(new errors.SessionLost("Session Lost"));
}
}
@@ -224,7 +224,6 @@ class Link {
}
await Promise.all(promises);
this.connector.setClosing();
}
}