summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathijs van Veluw <[email protected]>2024-10-06 13:49:00 +0200
committerGitHub <[email protected]>2024-10-06 13:49:00 +0200
commitf0efec7c9623fab4ba3c2b53cba724e4e6a8a739 (patch)
tree20f51bc1c7618ac7c0795a00597ac1d19150de03 /src
parent040e2a7bb0f2cc5012d46ca99283cf21fa06ed1a (diff)
downloadvaultwarden-f0efec7c9623fab4ba3c2b53cba724e4e6a8a739.tar.gz
vaultwarden-f0efec7c9623fab4ba3c2b53cba724e4e6a8a739.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/main.rs10
1 files changed, 6 insertions, 4 deletions
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<log::LevelFilter, Error> {
{
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<log::LevelFilter, Error> {
}
}
- #[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<log::LevelFilter, Error> {
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,