magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

partially revert 9a9c071e82; use std threads for db pool.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-01-05 23:33:27 +00:00
parent 925061b92d
commit d36167ab64
4 changed files with 80 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/router/run.rs
View file

@ -3,7 +3,7 @@ extern crate conduwuit_core as conduwuit;
extern crate conduwuit_service as service;
use std::{
sync::{atomic::Ordering, Arc},
sync::{atomic::Ordering, Arc, Weak},
time::Duration,
};
@ -92,11 +92,11 @@ pub(crate) async fn stop(services: Arc<Services>) -> Result<()> {
);
}
// The db threadpool requires async join if we use tokio/spawn_blocking to
// manage the threads. Without async-drop we have to wait here; for symmetry
// with Services construction it can't be done in services.stop().
if let Some(db) = db.upgrade() {
db.db.shutdown_pool().await;
if Weak::strong_count(&db) > 0 {
debug_error!(
"{} dangling references to Database after shutdown",
Weak::strong_count(&db)
);
}
#[cfg(feature = "systemd")]