From 22123c1b31b0ff6dc1948a7b07ad14a6b1524280 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Sun, 5 Mar 2023 12:27:58 -0800 Subject: [PATCH] refactoring: make signals support optional non-unix/windows targets (#185) Co-authored-by: John Sharratt's Shared Account Co-authored-by: Jose Quintana --- src/lib.rs | 1 + src/logger.rs | 2 +- src/server.rs | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 5f32657..f395485 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,6 +28,7 @@ pub mod security_headers; pub mod server; pub mod service; pub mod settings; +#[cfg(any(unix, windows))] pub mod signals; pub mod static_files; #[cfg(feature = "tls")] diff --git a/src/logger.rs b/src/logger.rs index 1540a4c..ac666bf 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -18,7 +18,7 @@ pub fn init(log_level: &str) -> Result { fn configure(level: &str) -> Result { let level = level.parse::()?; - #[cfg(unix)] + #[cfg(not(windows))] let enable_ansi = true; #[cfg(windows)] let enable_ansi = false; diff --git a/src/server.rs b/src/server.rs index 65ed7c4..3fb66bf 100644 --- a/src/server.rs +++ b/src/server.rs @@ -8,9 +8,11 @@ use std::sync::Arc; use tokio::sync::oneshot::Receiver; use crate::handler::{RequestHandler, RequestHandlerOpts}; +#[cfg(any(unix, windows))] +use crate::signals; #[cfg(feature = "tls")] use crate::tls::{TlsAcceptor, TlsConfigBuilder}; -use crate::{cors, helpers, logger, signals, Settings}; +use crate::{cors, helpers, logger, Settings}; use crate::{service::RouterService, Context, Result}; /// Define a multi-thread HTTP or HTTP/2 web server. -- libgit2 1.7.2