abstract async shutdown waiting loop

Signed-off-by: Jason Volk <jason@zemos.net>

src/core/server.rs

@@ -1,5 +1,8 @@
 use std::{
-	sync::atomic::{AtomicBool, Ordering},
+	sync::{
+		atomic::{AtomicBool, Ordering},
+		Arc,
+	},
 	time::SystemTime,
 };
 
@@ -102,6 +105,13 @@ impl Server {
 		Ok(())
 	}
 
+	#[inline]
+	pub async fn until_shutdown(self: Arc<Self>) {
+		while self.running() {
+			self.signal.subscribe().recv().await.ok();
+		}
+	}
+
 	#[inline]
 	pub fn runtime(&self) -> &runtime::Handle {
 		self.runtime

src/service/sync/watch.rs

@@ -97,13 +97,8 @@ pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) -> Result {
 	);
 
 	// Server shutdown
-	let server_shutdown = async move {
+	let server_shutdown = self.services.server.clone().until_shutdown().boxed();
-		while self.services.server.running() {
+	futures.push(server_shutdown);
-			self.services.server.signal.subscribe().recv().await.ok();
-		}
-	};
-
-	futures.push(server_shutdown.boxed());
 	if !self.services.server.running() {
 		return Ok(());
 	}