index : static-web-server.git

ascending towards madness

author Syrus Akbary <me@syrusakbary.com> 2023-03-05 20:27:58.0 +00:00:00
committer GitHub <noreply@github.com> 2023-03-05 20:27:58.0 +00:00:00
commit
22123c1b31b0ff6dc1948a7b07ad14a6b1524280 [patch]
tree
a5653bdb7373821301501d93ad04bf7f28294451
parent
7ed7b0398ee0c3faf1ce553e8345b92d1fdedebc
download
22123c1b31b0ff6dc1948a7b07ad14a6b1524280.tar.gz

refactoring: make signals support optional non-unix/windows targets (#185)

Co-authored-by: John Sharratt's Shared Account <johnathan.sharratt@gmail.com>
Co-authored-by: Jose Quintana <joseluisquintana20@gmail.com>

Diff

 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::<Level>()?;

    #[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.