berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

fix panic on shutdown

This commit is contained in:
fakeshadow 2021-04-06 09:56:46 +08:00
parent 5c463c67c1
commit ebd213d576
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actix-server/src/test_server.rs
View File

@ -35,7 +35,6 @@ pub struct TestServerRuntime {
addr: net::SocketAddr,
host: String,
port: u16,
system: System,
handle: ServerHandle,
}
@ -51,18 +50,17 @@ impl TestServer {
thread::spawn(move || {
System::new().block_on(async {
let server = factory(Server::build()).workers(1).disable_signals().run();
tx.send((server.handle(), System::current())).unwrap();
tx.send(server.handle()).unwrap();
server.await
})
});
let (handle, system) = rx.recv().unwrap();
let handle = rx.recv().unwrap();
TestServerRuntime {
addr: "127.0.0.1:0".parse().unwrap(),
host: "127.0.0.1".to_string(),
port: 0,
system,
handle,
}
}
@ -85,14 +83,13 @@ impl TestServer {
.disable_signals()
.run();
tx.send((server.handle(), System::current(), local_addr))
.unwrap();
tx.send((server.handle(), local_addr)).unwrap();
server.await
})
});
let (handle, system, addr) = rx.recv().unwrap();
let (handle, addr) = rx.recv().unwrap();
let host = format!("{}", addr.ip());
let port = addr.port();
@ -101,7 +98,6 @@ impl TestServer {
addr,
host,
port,
system,
handle,
}
}
@ -136,7 +132,6 @@ impl TestServerRuntime {
/// Stop http server
fn stop(&mut self) {
let _ = self.handle.stop(false);
self.system.stop();
}
/// Connect to server, return tokio TcpStream

2
actix-server/src/worker.rs
View File

@ -256,7 +256,7 @@ impl ServerWorker {
shutdown_timeout: config.shutdown_timeout,
};
local.block_on(&rt, worker)
local.block_on(&rt, async { worker.await });
}
Err(e) => factory_tx.send(Some(e)).unwrap(),
}