From bd4ecdeaf86fea57aec28c1a422bc0dec6ccf7c7 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Thu, 4 Apr 2024 13:57:02 +0100 Subject: [PATCH 1/2] Increase backend server startup delay --- src-tauri/src/backend.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/src/backend.rs b/src-tauri/src/backend.rs index 5d94272f8..5392ab098 100644 --- a/src-tauri/src/backend.rs +++ b/src-tauri/src/backend.rs @@ -54,7 +54,7 @@ async fn start_backend(base_url: String) -> Result<(), Box> { println!("Backend server started"); // Wait for the backend server to start - tokio::time::sleep(tokio::time::Duration::from_secs(5)).await; + tokio::time::sleep(tokio::time::Duration::from_secs(10)).await; // Check if the backend server is running let backend_active = check_backend(base_url.clone()).await; From 5499fb48d7a266f0f0734b6268802bc2a2171d72 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Thu, 4 Apr 2024 14:22:56 +0100 Subject: [PATCH 2/2] Change start --- src-tauri/src/backend.rs | 17 ++++------------- src-tauri/src/main.rs | 9 +++------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src-tauri/src/backend.rs b/src-tauri/src/backend.rs index 5392ab098..bb79ff58b 100644 --- a/src-tauri/src/backend.rs +++ b/src-tauri/src/backend.rs @@ -10,6 +10,8 @@ use crate::{ pub const BACKEND_HOST: &str = "127.0.0.1"; pub async fn setup_backend() -> Result<(), Box> { + println!("Setting up backend server.."); + // Get settings let settings: Settings = get_settings(); @@ -19,7 +21,7 @@ pub async fn setup_backend() -> Result<(), Box> { let backend_active = check_backend(base_url.clone()).await; if !backend_active.is_ok() { // Start the backend server - let backend_start = start_backend(base_url.clone()).await; + let backend_start = start_backend().await; if !backend_start.is_ok() { println!("Failed to start the backend server"); std::process::exit(1); @@ -44,7 +46,7 @@ pub async fn check_backend(base_url: String) -> Result<(), Box> { } } -async fn start_backend(base_url: String) -> Result<(), Box> { +async fn start_backend() -> Result<(), Box> { start_application( "_up_/dist/systembridgebackend/systembridgebackend".to_string(), None, @@ -53,17 +55,6 @@ async fn start_backend(base_url: String) -> Result<(), Box> { println!("Backend server started"); - // Wait for the backend server to start - tokio::time::sleep(tokio::time::Duration::from_secs(10)).await; - - // Check if the backend server is running - let backend_active = check_backend(base_url.clone()).await; - if !backend_active.is_ok() { - return Err("Failed to start the backend server".into()); - } - - println!("Backend server is running"); - Ok(()) } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 6f302e12a..1b885f7b0 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -57,17 +57,14 @@ async fn main() { let _handle = thread::spawn(move || { let rt = Runtime::new().unwrap(); rt.block_on(async { - // Setup the backend server - setup_backend().await.unwrap(); - // Check backend server is running every 60 seconds let mut interval: tokio::time::Interval = interval(Duration::from_secs(60)); loop { - println!("Waiting for 60 seconds before checking the backend server again"); - interval.tick().await; - // Setup the backend server setup_backend().await.unwrap(); + + println!("Waiting for 60 seconds before checking the backend server again"); + interval.tick().await; } }); });