mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 15:33:12 +09:00
Notify on connection events
Implement notification to plugins for disconnect request, connect, drop, and close. This allows plugins to properly handle slaves and the master server shutting down without sending messages that will get lost.
This commit is contained in:
1 parent
b8b8c44083
commit
c35b6de70e
13 files changed
+278
-31
No files matched your search
@@ -388,15 +388,15 @@ class BaseConnection extends link.Link {
|
||||
let slaveId = instanceConfig.get('instance.assigned_slave');
|
||||
if (slaveId === null) { return; }
|
||||
|
||||
let connection = slaveConnection.get(slaveId);
|
||||
if (!connection) { return; }
|
||||
let connection = slaveConnections.get(slaveId);
|
||||
if (!connection || connection.closing) { return; }
|
||||
|
||||
event.send(connection, message.data);
|
||||
}
|
||||
|
||||
async broadcastEventToInstance(message, event) {
|
||||
for (let slaveConnection of slaveConnections.values()) {
|
||||
if (slaveConnection === this) {
|
||||
if (slaveConnection === this || slaveConnection.connector.closing) {
|
||||
continue; // Do not broadcast back to the source
|
||||
}
|
||||
|
||||
@@ -405,6 +405,9 @@ class BaseConnection extends link.Link {
|
||||
}
|
||||
|
||||
async prepareDisconnectRequestHandler(message, request) {
|
||||
for (let masterPlugin of masterPlugins.values()) {
|
||||
await masterPlugin.onPrepareSlaveDisconnect(this);
|
||||
}
|
||||
this.connector.setClosing();
|
||||
return await super.prepareDisconnectRequestHandler(message, request);
|
||||
}
|
||||
@@ -574,7 +577,9 @@ class ControlConnection extends BaseConnection {
|
||||
|
||||
async debugDumpWsRequestHandler(message) {
|
||||
this.ws_dumper = data => {
|
||||
link.messages.debugWsMessage.send(this, data);
|
||||
if (this.connector.connected) {
|
||||
link.messages.debugWsMessage.send(this, data);
|
||||
}
|
||||
};
|
||||
this.connector._socket.clusterio_ignore_dump = true;
|
||||
debugEvents.on("message", this.ws_dumper)
|
||||
@@ -610,6 +615,14 @@ class SlaveConnection extends BaseConnection {
|
||||
slaveConnections.delete(this._id);
|
||||
}
|
||||
});
|
||||
|
||||
for (let event of ["connect", "drop", "close"]) {
|
||||
this.connector.on(event, () => {
|
||||
for (let masterPlugin of masterPlugins.values()) {
|
||||
masterPlugin.onSlaveConnectionEvent(this, event);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async updateInstancesEventHandler(message) {
|
||||
|
||||
Reference in new issue
Block a user