Return instantly when requesting restart.

serenity-rs · Apr 26, 2020 · 0959f15 · 0959f15
1 parent de6536d
commit 0959f15
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
@@ -298,7 +298,7 @@ impl ShardManager {
 
             if let Err(why) = runner.runner_tx.send(msg) {
                 warn!(
-                    "Failed to cleanly shutdown shard {}: {:?}",
+                    "Failed to send shutdown shard {}: {:?}",
                     shard_id,
                     why,
                 );
@@ -312,7 +312,7 @@ impl ShardManager {
                         );
                     },
                 Err(why) => warn!(
-                    "Failed to cleanly shutdown shard {}: {:?}",
+                    "Failed to cleanly shutdown shard {} due to timeout: {:?}",
                     shard_id,
                     why,
                 )

diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
@@ -142,8 +142,7 @@ impl<H: EventHandler + Send + Sync + 'static,
 
             match action {
                 Some(ShardAction::Reconnect(ReconnectType::Reidentify)) => {
-                    let _ = self.request_restart();
-                    continue;
+                    return self.request_restart();
                 },
                 Some(other) => {
                     let _ = self.action(&other);

diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs
@@ -613,7 +613,7 @@ impl Shard {
 
             false
         } else {
-            trace!("[Shard {:?}] Heartbeated", self.shard_info);
+            trace!("[Shard {:?}] Heartbeat", self.shard_info);
 
             true
         }
@@ -796,7 +796,7 @@ impl Shard {
     }
 
     pub fn resume(&mut self) -> Result<()> {
-        debug!("Shard {:?}] Attempting to resume", self.shard_info);
+        debug!("[Shard {:?}] Attempting to resume", self.shard_info);
 
         self.client = self.initialize()?;
         self.stage = ConnectionStage::Resuming;