diff options
| author | Zeyla Hellyer <[email protected]> | 2018-01-18 08:33:27 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2018-01-18 08:33:27 -0800 |
| commit | 9232b8f065deb4637a74e7f85ab617bb527c51be (patch) | |
| tree | 9c2cc2bd6b6238a1bd039e9ad4900e8705197af2 /src/client/bridge/gateway/shard_manager.rs | |
| parent | Fix travis' cache by chmoding $HOME/.cargo (#252) (diff) | |
| download | serenity-9232b8f065deb4637a74e7f85ab617bb527c51be.tar.xz serenity-9232b8f065deb4637a74e7f85ab617bb527c51be.zip | |
Use an InterMessage to communicate over gateway
Instead of communicating over the gateway in a split form of a
`serde_json::Value` or a `client::bridge::gateway::ShardClientMessage`,
wrap them both into a single enum for better interaction between the
client, gateway, and voice modules.
Diffstat (limited to 'src/client/bridge/gateway/shard_manager.rs')
| -rw-r--r-- | src/client/bridge/gateway/shard_manager.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs index c3c091c..ea3ad1e 100644 --- a/src/client/bridge/gateway/shard_manager.rs +++ b/src/client/bridge/gateway/shard_manager.rs @@ -1,3 +1,4 @@ +use gateway::InterMessage; use internal::prelude::*; use parking_lot::Mutex; use std::collections::{HashMap, VecDeque}; @@ -264,7 +265,8 @@ impl ShardManager { if let Some(runner) = self.runners.lock().get(&shard_id) { let shutdown = ShardManagerMessage::Shutdown(shard_id); - let msg = ShardClientMessage::Manager(shutdown); + let client_msg = ShardClientMessage::Manager(shutdown); + let msg = InterMessage::Client(client_msg); if let Err(why) = runner.runner_tx.send(msg) { warn!( |