Fix #2990 (#2991)

* Lower level

* Move calls

* Add thread to log

* Split wait

* Flip

* Refactor log message formatting in main.rs

* Update interval to 60 seconds in main.rs

Author: timmo001

src-tauri/src/backend.rs

@@ -10,20 +10,18 @@ use crate::{
 
 pub const BACKEND_HOST: &str = "127.0.0.1";
 
-pub async fn setup_backend() {
-    info!("Setting up backend server..");
-
+pub async fn keep_backend_alive() {
     // Get settings
     let settings: Settings = get_settings();
 
     let base_url = format!("http://{}:{}", BACKEND_HOST, settings.api.port.to_string());
 
     // Check if the backend server is running
     let backend_active = check_backend(base_url.clone()).await;
-    if !backend_active.is_ok() {
+    if backend_active.is_err() {
         // Start the backend server
         let backend_start = start_backend().await;
-        if !backend_start.is_ok() {
+        if backend_start.is_err() {
             info!("Failed to start the backend server");
             std::process::exit(1);
         }

src-tauri/src/main.rs

@@ -9,7 +9,7 @@ mod shared;
 mod websocket;
 
 use fern::colors::{Color, ColoredLevelConfig};
-use log::{info, LevelFilter};
+use log::{debug, info, LevelFilter};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::thread;
@@ -18,7 +18,7 @@ use tokio::runtime::Runtime;
 use tokio::time::interval;
 
 use crate::{
-    backend::{setup_backend, stop_backend},
+    backend::{keep_backend_alive, stop_backend},
     gui::setup_gui,
     resources::start_application,
     shared::get_data_path,
@@ -85,17 +85,23 @@ async fn run() {
         info!("Backend is disabled");
     } else {
         // Setup the backend server
+        info!("Setting up backend server..");
+
         let _handle = thread::spawn(move || {
             let rt = Runtime::new().unwrap();
             rt.block_on(async {
+                // Keep the backend server alive
+                keep_backend_alive().await;
                 // Check backend server is running every 60 seconds
                 let mut interval: tokio::time::Interval = interval(Duration::from_secs(60));
+                interval.tick().await;
                 loop {
-                    // Setup the backend server
-                    setup_backend().await;
-
                     info!("Waiting for 60 seconds before checking the backend server again");
                     interval.tick().await;
+                    debug!("Checking backend server..");
+
+                    // Keep the backend server alive
+                    keep_backend_alive().await;
                 }
             });
         });
@@ -127,9 +133,14 @@ fn setup_logger() -> Result<(), fern::InitError> {
     let stdout_config = fern::Dispatch::new()
         .format(move |out, message, record| {
             out.finish(format_args!(
-                "[{} {} {}] {}",
+                "{} {} ({}) [{}] {}",
                 humantime::format_rfc3339(std::time::SystemTime::now()),
                 colors.color(record.level()),
+                std::thread::current().name().unwrap_or(
+                    &format!("{:?}", std::thread::current().id())
+                        .replace("ThreadId(", "")
+                        .replace(")", "")
+                ),
                 record.target(),
                 message
             ))
@@ -139,9 +150,14 @@ fn setup_logger() -> Result<(), fern::InitError> {
     let file_config = fern::Dispatch::new()
         .format(move |out, message, record| {
             out.finish(format_args!(
-                "[{} {} {}] {}",
+                "[{} {} {} {}] {}",
                 humantime::format_rfc3339(std::time::SystemTime::now()),
                 record.level(),
+                std::thread::current().name().unwrap_or(
+                    &format!("{:?}", std::thread::current().id())
+                        .replace("ThreadId(", "")
+                        .replace(")", "")
+                ),
                 record.target(),
                 message
             ))

src-tauri/src/shared.rs

@@ -1,11 +1,11 @@
-use log::info;
+use log::debug;
 use platform_dirs::AppDirs;
 
 pub fn get_data_path() -> String {
     // Get data path from {localappdata}\timmo001\systembridge
     let app_dirs = AppDirs::new(Some("timmo001"), true).unwrap();
     let data_path = app_dirs.data_dir.to_str().unwrap().to_string();
-    info!("Data path: {}", data_path);
+    debug!("Data path: {}", data_path);
 
     let path = format!("{}/systembridge", data_path);