From 41cc9e0622b69868eb13db843b1323337cb7a544 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Tue, 11 Jun 2024 17:46:35 +0200 Subject: [PATCH] Remove logging file from config (was never implemented) --- src/settings.rs | 2 -- src/utils.rs | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/settings.rs b/src/settings.rs index bc966dd..842c527 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -16,7 +16,6 @@ pub struct Server { #[allow(unused)] pub struct Logging { pub level: String, - pub file: String, } #[derive(Clone, Debug, Deserialize, Default)] @@ -40,7 +39,6 @@ impl Default for Logging { fn default() -> Self { Logging { level: String::from("info"), - file: String::from("stdout"), } } } diff --git a/src/utils.rs b/src/utils.rs index 67e705b..00b066f 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -7,12 +7,12 @@ use log::LevelFilter; use simple_logger::SimpleLogger; use crate::errors::EmgauwaError; -use crate::settings::Permissions; +use crate::settings::{Logging, Permissions}; use crate::types::RelayStates; -pub fn init_logging(level: &str) -> Result<(), EmgauwaError> { - let log_level: LevelFilter = LevelFilter::from_str(level) - .map_err(|_| EmgauwaError::Other(format!("Invalid log level: {}", level)))?; +pub fn init_logging(logging: &Logging) -> Result<(), EmgauwaError> { + let log_level: LevelFilter = LevelFilter::from_str(&logging.level) + .map_err(|_| EmgauwaError::Other(format!("Invalid log level: {}", logging.level)))?; log::trace!("Log level set to {:?}", log_level); SimpleLogger::new()