backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unnecessary async and select!{}

Browse source
This commit is contained in:
Lambda 2024-05-20 16:49:20 +00:00
parent a60501189d
commit 092315e2cd
2 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/database.rs
View file

@ -1165,7 +1165,7 @@ impl KeyValueDatabase {
services().sending.start_handler(); services().sending.start_handler();
Self::start_cleanup_task().await; Self::start_cleanup_task();
Ok(()) Ok(())
} }
@ -1182,7 +1182,7 @@ impl KeyValueDatabase {
} }
#[tracing::instrument] #[tracing::instrument]
pub(crate) async fn start_cleanup_task() { pub(crate) fn start_cleanup_task() {
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
#[cfg(unix)] #[cfg(unix)]

15
src/service/admin.rs
View file

@ -239,8 +239,11 @@ impl Service {
if let Ok(Some(grapevine_room)) = services().admin.get_admin_room() { if let Ok(Some(grapevine_room)) = services().admin.get_admin_room() {
loop { loop {
tokio::select! { let event = receiver
Some(event) = receiver.recv() => { .recv()
.await
.expect("admin command channel has been closed");
let message_content = match event { let message_content = match event {
AdminRoomEvent::SendMessage(content) => content, AdminRoomEvent::SendMessage(content) => content,
AdminRoomEvent::ProcessMessage(room_message) => { AdminRoomEvent::ProcessMessage(room_message) => {
@ -249,7 +252,8 @@ impl Service {
}; };
let mutex_state = Arc::clone( let mutex_state = Arc::clone(
services().globals services()
.globals
.roomid_mutex_state .roomid_mutex_state
.write() .write()
.await .await
@ -275,9 +279,8 @@ impl Service {
&grapevine_room, &grapevine_room,
&state_lock, &state_lock,
) )
.await.unwrap(); .await
} .unwrap();
}
} }
} }
} }