mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 07:43:12 +09:00
Check result of rcon commands in subspace_storage
Validate that the commands sent don't error out by checking the returned result is empty.
This commit is contained in:
1 parent
3cc84d6400
commit
ee063300ed
1 file changed
+5
-4
@@ -22,13 +22,14 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
|
|||||||
async onStart() {
|
async onStart() {
|
||||||
this.pingId = setInterval(() => {
|
this.pingId = setInterval(() => {
|
||||||
this.instance.server.sendRcon(
|
this.instance.server.sendRcon(
|
||||||
"/sc __subspace_storage__ global.ticksSinceMasterPinged = 0"
|
"/sc __subspace_storage__ global.ticksSinceMasterPinged = 0", true
|
||||||
).catch(unexpectedError);
|
).catch(unexpectedError);
|
||||||
}, 5000);
|
}, 5000);
|
||||||
|
|
||||||
let response = await this.info.messages.getStorage.send(this.instance);
|
let response = await this.info.messages.getStorage.send(this.instance);
|
||||||
|
// TODO Diff with dump of invdata produce minimal command to sync
|
||||||
let itemsJson = luaTools.escapeString(JSON.stringify(response.items));
|
let itemsJson = luaTools.escapeString(JSON.stringify(response.items));
|
||||||
await this.instance.server.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}", true)`);
|
await this.instance.server.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}", true)`, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
async onStop() {
|
async onStop() {
|
||||||
@@ -66,7 +67,7 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let itemsJson = luaTools.escapeString(JSON.stringify(response.items));
|
let itemsJson = luaTools.escapeString(JSON.stringify(response.items));
|
||||||
await this.instance.server.sendRcon(`/sc __subspace_storage__ Import("${itemsJson}")`);
|
await this.instance.server.sendRcon(`/sc __subspace_storage__ Import("${itemsJson}")`, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// combinator signals ---------------------------------------------------------
|
// combinator signals ---------------------------------------------------------
|
||||||
@@ -85,7 +86,7 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
|
|||||||
items.push(["signal-unixtime", Math.floor(Date.now()/1000)]);
|
items.push(["signal-unixtime", Math.floor(Date.now()/1000)]);
|
||||||
|
|
||||||
let itemsJson = luaTools.escapeString(JSON.stringify(items));
|
let itemsJson = luaTools.escapeString(JSON.stringify(items));
|
||||||
await this.instance.server.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}")`);
|
await this.instance.server.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}")`, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user