From f0efec7c9623fab4ba3c2b53cba724e4e6a8a739 Mon Sep 17 00:00:00 2001 From: Mathijs van Veluw Date: Sun, 6 Oct 2024 13:49:00 +0200 Subject: [PATCH] Fix compiling for Windows targets (#5053) The `unix::signal` was also included during Windows compilations. This of course will not work. Fix this by only including it for `unix` targets. Also changed all other conditional compilation options to use `cfg(unix)` instead of `cfg(not(windows))`. The latter may also include `wasm` for example, or any other future target family. This way we will only match `unix` Fixes #5052 --- Cargo.toml | 2 +- src/main.rs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63060089..2f319cf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ query_logger = ["dep:diesel_logger"] # Currently only used to enable rusts official ip support unstable = [] -[target."cfg(not(windows))".dependencies] +[target."cfg(unix)".dependencies] # Logging syslog = "6.1.1" diff --git a/src/main.rs b/src/main.rs index e8830f2a..33c38027 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,9 +38,11 @@ use std::{ use tokio::{ fs::File, io::{AsyncBufReadExt, BufReader}, - signal::unix::SignalKind, }; +#[cfg(unix)] +use tokio::signal::unix::SignalKind; + #[macro_use] mod error; mod api; @@ -383,7 +385,7 @@ fn init_logging() -> Result { { logger = logger.chain(fern::log_file(log_file)?); } - #[cfg(not(windows))] + #[cfg(unix)] { const SIGHUP: i32 = SignalKind::hangup().as_raw_value(); let path = Path::new(&log_file); @@ -391,7 +393,7 @@ fn init_logging() -> Result { } } - #[cfg(not(windows))] + #[cfg(unix)] { if cfg!(feature = "enable_syslog") || CONFIG.use_syslog() { logger = chain_syslog(logger); @@ -441,7 +443,7 @@ fn init_logging() -> Result { Ok(level) } -#[cfg(not(windows))] +#[cfg(unix)] fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch { let syslog_fmt = syslog::Formatter3164 { facility: syslog::Facility::LOG_USER,