config: change Mutex -> RwLock

Author: manio

src/config.rs

@@ -8,12 +8,16 @@ use std::{
     path::PathBuf,
     process::{Command, Stdio},
     str::FromStr,
+    sync::Arc,
 };
+use tokio::sync::RwLock;
 use toml_edit::{value, DocumentMut};
 
 // module name for logging engine
 const NAME: &str = "<i><bright-black> config: </>";
 
+pub type SharedConfig = Arc<RwLock<AppConfig>>;
+
 #[derive(
     clap::ValueEnum, Default, Debug, PartialEq, PartialOrd, Clone, Copy, Deserialize, Serialize,
 )]

src/main.rs

@@ -28,7 +28,7 @@ use tokio::sync::Notify;
 use tokio::time::Instant;
 
 use std::net::SocketAddr;
-use std::sync::Mutex;
+use tokio::sync::RwLock;
 
 // module name for logging engine
 const NAME: &str = "<i><bright-black> main: </>";
@@ -168,7 +168,7 @@ async fn tokio_main(
     if let Some(ref bindaddr) = config.webserver {
         // preparing AppState and starting webserver
         let state = web::AppState {
-            config: Arc::new(Mutex::new(config.clone())),
+            config: Arc::new(RwLock::new(config.clone())),
             config_file: config_file.into(),
         };
         let app = web::app(state.into());

src/web.rs

@@ -1,4 +1,5 @@
 use crate::config::AppConfig;
+use crate::config::SharedConfig;
 use axum::{
     body::Body,
     extract::{Query, State},
@@ -10,15 +11,15 @@ use axum::{
 use chrono::Local;
 use std::collections::HashMap;
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use tokio::fs;
 
 const TEMPLATE: &str = include_str!("../static/index.html");
 const PICO_CSS: &str = include_str!("../static/pico.min.css");
 
 #[derive(Clone)]
 pub struct AppState {
-    pub config: Arc<Mutex<AppConfig>>,
+    pub config: SharedConfig,
     pub config_file: Arc<PathBuf>,
 }
 
@@ -48,7 +49,7 @@ async fn download_handler(
     State(state): State<Arc<AppState>>,
     Query(params): Query<HashMap<String, String>>,
 ) -> impl IntoResponse {
-    let file_path = state.config.lock().unwrap().logfile.clone();
+    let file_path = state.config.read().await.logfile.clone();
     // if we have filename parameter, use it; default otherwise
     let filename = params
         .get("filename")
@@ -73,7 +74,7 @@ async fn download_handler(
 }
 
 async fn get_config(State(state): State<Arc<AppState>>) -> impl IntoResponse {
-    let cfg = state.config.lock().unwrap().clone();
+    let cfg = state.config.read().await.clone();
     Json(cfg)
 }
 
@@ -82,7 +83,7 @@ async fn set_config(
     Json(new_cfg): Json<AppConfig>,
 ) -> impl IntoResponse {
     {
-        let mut cfg = state.config.lock().unwrap();
+        let mut cfg = state.config.write().await;
         *cfg = new_cfg.clone();
         cfg.save((&state.config_file).to_path_buf());
     }