From 19b31626c9b720c73f63ad1bcad7c5ad6dd979e4 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Sat, 18 Jan 2025 18:59:17 +0300 Subject: [PATCH] fix silly async bugs --- src/ezhttp/server/mod.rs | 4 ++-- src/ezhttp/server/starter.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ezhttp/server/mod.rs b/src/ezhttp/server/mod.rs index 0ede3ce..724b6db 100755 --- a/src/ezhttp/server/mod.rs +++ b/src/ezhttp/server/mod.rs @@ -9,7 +9,7 @@ use std::{ use async_trait::async_trait; use threadpool::ThreadPool; use tokio::net::TcpListener; -use tokio::runtime::Runtime; +use tokio::runtime::Handle; use tokio_io_timeout::TimeoutStream; use crate::pin_handler; @@ -55,7 +55,7 @@ where let listener = TcpListener::bind(host).await?; let old_handler = handler; let handler = Arc::new(move |now_server, sock| { - Runtime::new().unwrap().block_on(old_handler(now_server, sock)); + Handle::current().block_on(old_handler(now_server, sock)); }); let host_clone = String::from(host).clone(); diff --git a/src/ezhttp/server/starter.rs b/src/ezhttp/server/starter.rs index 16e4925..fd67a6b 100755 --- a/src/ezhttp/server/starter.rs +++ b/src/ezhttp/server/starter.rs @@ -1,4 +1,4 @@ -use tokio::{runtime::Runtime, task::JoinHandle}; +use tokio::task::JoinHandle; use super::{ start_server_new_thread, @@ -142,7 +142,7 @@ impl HttpServerStarter { let running_clone = running.clone(); let thread = if self.threads == 0 { - Runtime::new().unwrap().spawn(async move { + tokio::spawn(async move { start_server_new_thread( self.http_server, &self.host, @@ -153,7 +153,7 @@ impl HttpServerStarter { .expect("http server error"); }) } else if self.threads == 1 { - Runtime::new().unwrap().spawn(async move { + tokio::spawn(async move { start_server_sync( self.http_server, &self.host, @@ -164,7 +164,7 @@ impl HttpServerStarter { .expect("http server error"); }) } else { - Runtime::new().unwrap().spawn(async move { + tokio::spawn(async move { start_server_with_threadpool( self.http_server, &self.host,