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

Merge branch 'master' into feature/io-uring

This commit is contained in:
Rob Ede 2021-10-04 02:48:50 +01:00 committed by GitHub
parent f847a914db c3d697df97
commit a1565b83e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actix-server/CHANGES.md
View File

@ -4,9 +4,14 @@
* Remove `config` module. `ServiceConfig`, `ServiceRuntime` public types are removed due to this change. [#349] * Remove `config` module. `ServiceConfig`, `ServiceRuntime` public types are removed due to this change. [#349]
* Remove `ServerBuilder::configure` [#349] * Remove `ServerBuilder::configure` [#349]
* Add `io-uring` feature for enabling async file I/O on linux. [#374] * Add `io-uring` feature for enabling async file I/O on linux. [#374]
* Server no long listens to SIGHUP signal.
It actually did not take any action when receiving SIGHUP, the only thing SIGHUP did was to stop
the Server from receiving any future signal, because the `Signals` future stops on the first
signal received [#389]
[#349]: https://github.com/actix/actix-net/pull/349
[#374]: https://github.com/actix/actix-net/pull/374 [#374]: https://github.com/actix/actix-net/pull/374
[#349]: https://github.com/actix/actix-net/pull/349
[#389]: https://github.com/actix/actix-net/pull/389
## 2.0.0-beta.5 - 2021-04-20 ## 2.0.0-beta.5 - 2021-04-20

1
actix-server/src/builder.rs
View File

@ -335,7 +335,6 @@ impl ServerBuilder {
completion: None, completion: None,
}) })
} }
_ => (),
} }
} }
ServerCommand::Notify(tx) => { ServerCommand::Notify(tx) => {

3
actix-server/src/signals.rs
View File

@ -8,8 +8,6 @@ use crate::server::Server;
#[allow(dead_code)] #[allow(dead_code)]
#[derive(PartialEq, Clone, Copy, Debug)] #[derive(PartialEq, Clone, Copy, Debug)]
pub(crate) enum Signal { pub(crate) enum Signal {
/// SIGHUP
Hup,
/// SIGINT /// SIGINT
Int, Int,
/// SIGTERM /// SIGTERM
@ -41,7 +39,6 @@ impl Signals {
let sig_map = [ let sig_map = [
(unix::SignalKind::interrupt(), Signal::Int), (unix::SignalKind::interrupt(), Signal::Int),
(unix::SignalKind::hangup(), Signal::Hup),
(unix::SignalKind::terminate(), Signal::Term), (unix::SignalKind::terminate(), Signal::Term),
(unix::SignalKind::quit(), Signal::Quit), (unix::SignalKind::quit(), Signal::Quit),
]; ];