add watch logic back

johnnynotsolucky · Aug 17, 2023 · c8a2d78 · c8a2d78
1 parent 08d362d
commit c8a2d78
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/sluggy/src/main.rs b/sluggy/src/main.rs
@@ -140,25 +140,24 @@ impl Command {
 						}
 					}
 				});
-				serve_handle.await?
-
-				// let watch_handle = tokio::spawn({
-				// 	let server_config = server_config.clone();
-				// 	async move {
-				// 		if server_config.clone().watch {
-				// 			if let Err(error) = watcher.watch().await {
-				// 				println!("Error: {error}");
-				// 			}
-				// 		} else {
-				// 			futures::pending!()
-				// 		}
-				// 	}
-				// });
-				//
-				// select! {
-				// 	_ = serve_handle => {},
-				// 	_ = watch_handle => {},
-				// }
+
+				let watch_handle = tokio::spawn({
+					let server_config = server_config.clone();
+					async move {
+						if server_config.clone().watch {
+							if let Err(error) = watcher.watch().await {
+								println!("Error: {error}");
+							}
+						} else {
+							futures::pending!()
+						}
+					}
+				});
+
+				select! {
+					_ = serve_handle => {},
+					_ = watch_handle => {},
+				}
 			}
 		}