Fix hot_restart logs

itome · Jun 3, 2024 · 3223cd5 · 3223cd5
1 parent ebd5b10
commit 3223cd5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/daemon/Cargo.toml b/crates/daemon/Cargo.toml
@@ -8,6 +8,7 @@ serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 tokio = { version = "1.32.0", features = ["full"] }
 color-eyre = "0.6.2"
+log = "0.4.21"
 
 [dev-dependencies]
-clap = { version = "4.5.2", features = ["derive"] }
+clap = { version = "4.5.2", features = ["derive"] }
diff --git a/src/redux/thunk/hot_reload.rs b/src/redux/thunk/hot_reload.rs
@@ -39,27 +39,5 @@ where
             log::error!("Failed to hot reload: {}", err);
             return;
         }
-
-        while let Ok(params) = run.receive_app_progress().await {
-            if params.progress_id == Some("hot.reload".to_string()) && !params.finished {
-                store
-                    .dispatch(Action::StartHotReload {
-                        session_id: session_id.clone(),
-                    })
-                    .await;
-                break;
-            }
-        }
-
-        while let Ok(params) = run.receive_app_progress().await {
-            if params.progress_id == Some("hot.reload".to_string()) && params.finished {
-                store
-                    .dispatch(Action::CompleteHotReload {
-                        session_id: session_id.clone(),
-                    })
-                    .await;
-                break;
-            }
-        }
     }
 }
diff --git a/src/redux/thunk/hot_restart.rs b/src/redux/thunk/hot_restart.rs
@@ -38,27 +38,5 @@ where
             log::error!("Failed to hot restart: {}", err);
             return;
         }
-
-        while let Ok(params) = run.receive_app_progress().await {
-            if params.progress_id == Some("hot.restart".to_string()) && !params.finished {
-                store
-                    .dispatch(Action::StartHotRestart {
-                        session_id: session_id.clone(),
-                    })
-                    .await;
-                break;
-            }
-        }
-
-        while let Ok(params) = run.receive_app_progress().await {
-            if params.progress_id == Some("hot.restart".to_string()) && params.finished {
-                store
-                    .dispatch(Action::CompleteHotRestart {
-                        session_id: session_id.clone(),
-                    })
-                    .await;
-                break;
-            }
-        }
     }
 }
diff --git a/src/redux/thunk/run_new_app.rs b/src/redux/thunk/run_new_app.rs
@@ -115,6 +115,27 @@ where
                             message: progress.message,
                         })
                         .await;
+                    if progress.progress_id == Some("hot.restart".to_string()) {
+                        if !progress.finished {
+                            store.dispatch(Action::StartHotRestart{
+                                session_id: id.clone(),
+                            }).await;
+                        } else {
+                            store.dispatch(Action::CompleteHotRestart {
+                                session_id: id.clone(),
+                            }).await;
+                        }
+                    } else if progress.progress_id == Some("hot.reload".to_string()) {
+                        if !progress.finished {
+                            store.dispatch(Action::StartHotReload{
+                                session_id: id.clone(),
+                            }).await;
+                        } else {
+                            store.dispatch(Action::CompleteHotReload {
+                                session_id: id.clone(),
+                            }).await;
+                        }
+                    }
                 },
                 Ok(params) = run.receive_app_debug_port() => {
                     let store = store.clone();