From 7cb8f930d13fb82e4bf4fb293b436903d7e97e6f Mon Sep 17 00:00:00 2001
From: Herbert Wolverson <herberticus@gmail.com>
Date: Thu, 19 Jan 2023 14:59:12 +0000
Subject: [PATCH] De-async two things that shouldn't have been async to begin
 with.

---
 src/rust/lqosd/src/lqos_daht_test.rs |  2 +-
 src/rust/lqosd/src/main.rs           | 12 ++----------
 src/rust/lqosd/src/tuning/mod.rs     |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/rust/lqosd/src/lqos_daht_test.rs b/src/rust/lqosd/src/lqos_daht_test.rs
index ab1d9e71..c6b68cf4 100644
--- a/src/rust/lqosd/src/lqos_daht_test.rs
+++ b/src/rust/lqosd/src/lqos_daht_test.rs
@@ -8,7 +8,7 @@ lazy_static! {
     static ref TEST_BUSY: Mutex<bool> = Mutex::new(false);
 }
 
-pub async fn lqos_daht_test() -> BusResponse {
+pub fn lqos_daht_test() -> BusResponse {
     spawn_blocking(|| {
         if let Some(_lock) = TEST_BUSY.try_lock() {
             Command::new("/bin/ssh")
diff --git a/src/rust/lqosd/src/main.rs b/src/rust/lqosd/src/main.rs
index 0a699938..e58c452f 100644
--- a/src/rust/lqosd/src/main.rs
+++ b/src/rust/lqosd/src/main.rs
@@ -122,19 +122,11 @@ fn handle_bus_requests(requests: &[BusRequest], responses: &mut Vec<BusResponse>
                 lqos_bus::BusResponse::Ack
             }
             BusRequest::UpdateLqosDTuning(..) => {
-                let tokio_rt = tokio::runtime::Builder::new_current_thread()
-                    .enable_io()
-                    .build()
-                    .unwrap();
-                tokio_rt.block_on(tuning::tune_lqosd_from_bus(&req))
+                tuning::tune_lqosd_from_bus(&req)
             }
             #[cfg(feature = "equinix_tests")]
             BusRequest::RequestLqosEquinixTest => {
-                let tokio_rt = tokio::runtime::Builder::new_current_thread()
-                    .enable_io()
-                    .build()
-                    .unwrap();
-                tokio_rt.block_on(lqos_daht_test::lqos_daht_test())
+                lqos_daht_test::lqos_daht_test()
             }
         });
     }
diff --git a/src/rust/lqosd/src/tuning/mod.rs b/src/rust/lqosd/src/tuning/mod.rs
index 4585fa8c..539326b5 100644
--- a/src/rust/lqosd/src/tuning/mod.rs
+++ b/src/rust/lqosd/src/tuning/mod.rs
@@ -22,7 +22,7 @@ pub fn tune_lqosd_from_config_file(config: &LibreQoSConfig) -> Result<()> {
     Ok(())
 }
 
-pub async fn tune_lqosd_from_bus(request: &BusRequest) -> BusResponse {
+pub fn tune_lqosd_from_bus(request: &BusRequest) -> BusResponse {
     match request {
         BusRequest::UpdateLqosDTuning(interval, tuning) => {
             // Real-time tuning changes. Probably dangerous.