mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 18:28:20 +02:00 
			
		
		
		
	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
This commit is contained in:
		
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							040e2a7bb0
						
					
				
				
					commit
					f0efec7c96
				
			
							
								
								
									
										10
									
								
								src/main.rs
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user