admin terminal console

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

src/service/globals/data.rs

@@ -160,7 +160,9 @@ impl Data for KeyValueDatabase {
 		futures.push(self.userid_lastonetimekeyupdate.watch_prefix(&userid_bytes));
 
 		futures.push(Box::pin(async move {
-			let _result = services().server.signal.subscribe().recv().await;
+			while services().server.running() {
+				let _result = services().server.signal.subscribe().recv().await;
+			}
 		}));
 
 		if !services().server.running() {

src/service/globals/migrations.rs

@@ -190,7 +190,7 @@ pub(crate) async fn migrations(db: &KeyValueDatabase, config: &Config) -> Result
 			.insert(b"retroactively_fix_bad_data_from_roomuserid_joined", &[])?;
 
 		// Create the admin room and server user on first run
-		services().admin.create_admin_room().await?;
+		crate::admin::create_admin_room().await?;
 
 		warn!(
 			"Created new {} database with version {}",