Fix tokio runtime builders

3 files changed, 4 insertions, 8 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index a355f94e44..53d38f8902 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -26,7 +26,7 @@ fn main() {
         std::process::exit(1)
     });
 
-    let mut runtime = new_runtime_builder().build().unwrap_or_else(|error| {
+    let runtime = new_runtime_builder().build().unwrap_or_else(|error| {
         eprintln!("{}", error.display_chain());
         std::process::exit(1);
     });
diff --git a/mullvad-daemon/src/runtime.rs b/mullvad-daemon/src/runtime.rs
index 3c60b133e8..34bdf60390 100644
--- a/mullvad-daemon/src/runtime.rs
+++ b/mullvad-daemon/src/runtime.rs
@@ -1,11 +1,7 @@
 use tokio::runtime;
 
 pub fn new_runtime_builder() -> runtime::Builder {
-    let mut builder = runtime::Builder::new();
-    builder
-        .threaded_scheduler()
-        .core_threads(4)
-        .max_threads(8)
-        .enable_all();
+    let mut builder = runtime::Builder::new_multi_thread();
+    builder.worker_threads(4).enable_all();
     builder
 }
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index bd51f64999..34580e93e0 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -105,7 +105,7 @@ pub fn handle_service_main(_arguments: Vec<OsString>) {
     let log_dir = crate::get_log_dir(cli::get_config()).expect("Log dir should be available here");
 
     let runtime = new_runtime_builder().build();
-    let mut runtime = match runtime {
+    let runtime = match runtime {
         Err(error) => {
             log::error!("{}", error.display_chain());
             persistent_service_status