Use the threadpool for framework command execution

Instead of executing framework commands in the shard runner thread
(potentially blocking the shard runner from reading new messages over
the websocket and heartbeating), dispatch framework commands to the
shard runner's threadpool.

1 files changed, 11 insertions, 29 deletions

diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
index a5fde3d..005f321 100644
--- a/src/client/bridge/gateway/shard_runner.rs
+++ b/src/client/bridge/gateway/shard_runner.rs
@@ -203,36 +203,18 @@ impl<H: EventHandler + Send + Sync + 'static> ShardRunner<H> {
         false
     }
 
+    #[inline]
     fn dispatch(&self, event: Event) {
-        let data = Arc::clone(&self.data);
-        let event_handler = Arc::clone(&self.event_handler);
-        let runner_tx = self.runner_tx.clone();
-        let shard_id = self.shard.shard_info()[0];
-
-        feature_framework! {{
-            let framework = Arc::clone(&self.framework);
-
-            self.threadpool.execute(move || {
-                dispatch(
-                    event,
-                    framework,
-                    data,
-                    event_handler,
-                    runner_tx,
-                    shard_id,
-                );
-            });
-        } else {
-            self.threadpool.execute(move || {
-                dispatch(
-                    event,
-                    data,
-                    event_handler,
-                    runner_tx,
-                    shard_id,
-                );
-            });
-        }}
+        dispatch(
+            event,
+            #[cfg(feature = "framework")]
+            &self.framework,
+            &self.data,
+            &self.event_handler,
+            &self.runner_tx,
+            &self.threadpool,
+            self.shard.shard_info()[0],
+        );
     }
 
     // Handles a received value over the shard runner rx channel.