Fix heartbeat checking

If a heartbeat acknowledgement is not received, then the shard should
restart.

2 files changed, 22 insertions, 22 deletions

diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
index bfe4214..466ce63 100644
--- a/src/client/bridge/gateway/shard_runner.rs
+++ b/src/client/bridge/gateway/shard_runner.rs
@@ -94,14 +94,9 @@ impl<H: EventHandler + Send + Sync + 'static> ShardRunner<H> {
             }
 
             // check heartbeat
-            if let Err(why) = self.shard.check_heartbeat() {
+            if !self.shard.check_heartbeat() {
                 warn!(
-                    "[ShardRunner {:?}] Error heartbeating: {:?}",
-                    self.shard.shard_info(),
-                    why,
-                );
-                debug!(
-                    "[ShardRunner {:?}] Requesting restart",
+                    "[ShardRunner {:?}] Error heartbeating",
                     self.shard.shard_info(),
                 );
 
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs
index da87c61..8f6969d 100644
--- a/src/gateway/shard.rs
+++ b/src/gateway/shard.rs
@@ -550,11 +550,24 @@ impl Shard {
         }
     }
 
-    pub fn check_heartbeat(&mut self) -> Result<()> {
+    /// Checks whether a heartbeat needs to be sent, as well as whether a
+    /// heartbeat acknowledgement was received.
+    ///
+    /// `true` is returned under one of the following conditions:
+    ///
+    /// - the heartbeat interval has not elapsed
+    /// - a heartbeat was successfully sent
+    /// - there is no known heartbeat interval yet
+    ///
+    /// `false` is returned under one of the following conditions:
+    ///
+    /// - a heartbeat acknowledgement was not received in time
+    /// - an error occurred while heartbeating
+    pub fn check_heartbeat(&mut self) -> bool {
         let wait = {
             let heartbeat_interval = match self.heartbeat_interval {
                 Some(heartbeat_interval) => heartbeat_interval,
-                None => return Ok(()),
+                None => return true,
             };
 
             StdDuration::from_secs(heartbeat_interval / 1000)
@@ -564,7 +577,7 @@ impl Shard {
         // then don't perform a keepalive or attempt to reconnect.
         if let Some(last_sent) = self.heartbeat_instants.0 {
             if last_sent.elapsed() <= wait {
-                return Ok(());
+                return true;
             }
         }
 
@@ -572,30 +585,22 @@ impl Shard {
         // auto-reconnect.
         if !self.last_heartbeat_acknowledged {
             debug!(
-                "[Shard {:?}] Last heartbeat not acknowledged; re-connecting",
+                "[Shard {:?}] Last heartbeat not acknowledged",
                 self.shard_info,
             );
 
-            return self.reconnect().map_err(|why| {
-                warn!(
-                    "[Shard {:?}] Err auto-reconnecting from heartbeat check: {:?}",
-                    self.shard_info,
-                    why,
-                );
-
-                why
-            });
+            return false;
         }
 
         // Otherwise, we're good to heartbeat.
         if let Err(why) = self.heartbeat() {
             warn!("[Shard {:?}] Err heartbeating: {:?}", self.shard_info, why);
 
-            self.reconnect()
+            false
         } else {
             trace!("[Shard {:?}] Heartbeated", self.shard_info);
 
-            Ok(())
+            true
         }
     }