From f777c19fbf3e770cc54531241c24ec19e6ae9952 Mon Sep 17 00:00:00 2001 From: Schuyler Cebulskie Date: Sun, 19 Nov 2017 02:03:44 -0500 Subject: [PATCH] Fix naming conflict with ShardingManager#respawn --- src/sharding/Shard.js | 2 +- src/sharding/ShardClientUtil.js | 2 +- src/sharding/ShardingManager.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sharding/Shard.js b/src/sharding/Shard.js index 6ae4cc600..cbe85110b 100644 --- a/src/sharding/Shard.js +++ b/src/sharding/Shard.js @@ -259,7 +259,7 @@ class Shard extends EventEmitter { // Shard is requesting a respawn of all shards if (message._sRespawnAll) { const { shardDelay, respawnDelay, waitForReady } = message._sRespawnAll; - this.manager.respawn(shardDelay, respawnDelay, waitForReady).catch(() => { + this.manager.respawnAll(shardDelay, respawnDelay, waitForReady).catch(() => { // Do nothing }); return; diff --git a/src/sharding/ShardClientUtil.js b/src/sharding/ShardClientUtil.js index df1bc8341..b62cb36c4 100644 --- a/src/sharding/ShardClientUtil.js +++ b/src/sharding/ShardClientUtil.js @@ -106,7 +106,7 @@ class ShardClientUtil { * (in milliseconds) * @param {boolean} [waitForReady=true] Whether to wait for a shard to become ready before continuing to another * @returns {Promise} Resolves upon the message being sent - * @see {@link ShardingManager#respawn} + * @see {@link ShardingManager#respawnAll} */ respawnAll(shardDelay = 5000, respawnDelay = 500, waitForReady = true) { return this.send({ _sRespawnAll: { shardDelay, respawnDelay, waitForReady } }); diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js index 0c7de0ab0..85b2f2c67 100644 --- a/src/sharding/ShardingManager.js +++ b/src/sharding/ShardingManager.js @@ -184,7 +184,7 @@ class ShardingManager extends EventEmitter { * @param {boolean} [waitForReady=true] Whether to wait for a shard to become ready before continuing to another * @returns {Promise>} */ - async respawn(shardDelay = 5000, respawnDelay = 500, waitForReady = true) { + async respawnAll(shardDelay = 5000, respawnDelay = 500, waitForReady = true) { let s = 0; for (const shard of this.shards) { const promises = [shard.respawn(respawnDelay, waitForReady)];