fix(friendshipper): report startup errors to frontend

believer-oss · Oct 16, 2024 · 8e5b02e · 8e5b02e
1 parent b25f789
commit 8e5b02e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/friendshipper/src-tauri/src/main.rs b/friendshipper/src-tauri/src/main.rs
@@ -351,11 +351,21 @@ fn main() -> Result<(), CoreError> {
                     );
 
                     match server
-                        .run(config, config_file, startup_tx, refresh_tx, shutdown_rx)
+                        .run(
+                            config,
+                            config_file,
+                            startup_tx.clone(),
+                            refresh_tx,
+                            shutdown_rx,
+                        )
                         .await
                     {
                         Ok(_) => {}
                         Err(e) => {
+                            startup_tx
+                                .send("Warning: Server failed to start".to_string())
+                                .unwrap();
+                            git_tx.send(e.to_string()).unwrap();
                             error!("Server error: {:?}", e);
                         }
                     }

diff --git a/friendshipper/src-tauri/src/server.rs b/friendshipper/src-tauri/src/server.rs
@@ -284,7 +284,13 @@ impl Server {
 
                 startup_tx.send("Performing git repo maintenance".to_string())?;
                 git.expire_reflog().await?;
-                git.run_gc().await?;
+                match git.run_gc().await {
+                    Ok(_) => {}
+                    Err(e) => {
+                        error!("Failed to run git gc: {:?}", e);
+                        startup_tx.send("Warning: Git maintenance failed".to_string())?;
+                    }
+                }
 
                 startup_tx.send("Installing git hooks".to_string())?;
                 if let Some(git_hooks_path) = git_hooks_path {