disable watch logic temporarily

johnnynotsolucky · Aug 17, 2023 · b8b93bd · b8b93bd
1 parent f6ddf4e
commit b8b93bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/sluggy/src/main.rs b/sluggy/src/main.rs
@@ -140,24 +140,25 @@ impl Command {
 						}
 					}
 				});
-
-				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 => {},
-				}
+				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 => {},
+				// }
 			}
 		}
 

diff --git a/sluggy_core/src/error.rs b/sluggy_core/src/error.rs
@@ -12,7 +12,7 @@ pub type Result<T> = StdResult<T, Error>;
 pub enum Error {
 	#[error("json pointer error")]
 	JsonPointer(#[from] JsonPointerError),
-	#[error("notify error")]
+	#[error(transparent)]
 	NotifyError(#[from] NotifyError),
 	#[error("join error")]
 	JoinError(#[from] JoinError),