summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-18 11:13:29 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-01-15 15:54:16 +0100
commitc50febb59f6f36f829fe56935fd2b0cdcf3ad92f (patch)
tree142afd508b32ddd988b0b85da09a276f9c4fcfbc
parentba7346a62cdf71e7fbb810b1358ca055c6906199 (diff)
downloadmullvadvpn-c50febb59f6f36f829fe56935fd2b0cdcf3ad92f.tar.xz
mullvadvpn-c50febb59f6f36f829fe56935fd2b0cdcf3ad92f.zip
Use new tokio event loop creation mechanism
-rw-r--r--mullvad-daemon/src/main.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 23351fad2e..32c86330f2 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -200,7 +200,10 @@ struct Daemon {
impl Daemon {
pub fn new(tunnel_log: Option<PathBuf>) -> Result<Self> {
let resource_dir = get_resource_dir();
- let rpc_http_handle = mullvad_rpc::connect().chain_err(|| "Unable to connect to RPC API")?;
+
+ let rpc_http_handle = mullvad_rpc::event_loop::create(|core| {
+ mullvad_rpc::shared(&core.handle())
+ }).chain_err(|| "Unable to initialize network event loop")?;
let relay_selector = Self::create_relay_selector(rpc_http_handle.clone(), &resource_dir)?;