From 5f7636f177ddde0c630f24f347a8f638a7304278 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 17 Dec 2024 14:51:21 +0000 Subject: [PATCH] set dbpool thread name (gated by tokio_unstable) Signed-off-by: Jason Volk Signed-off-by: strawberry --- Cargo.toml | 1 + src/database/pool.rs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index cb2ab916..cffbebfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -242,6 +242,7 @@ features = [ "time", "rt-multi-thread", "io-util", + "tracing", ] [workspace.dependencies.tokio-metrics] diff --git a/src/database/pool.rs b/src/database/pool.rs index e4d78897..65012527 100644 --- a/src/database/pool.rs +++ b/src/database/pool.rs @@ -122,8 +122,16 @@ async fn spawn_until(self: &Arc, recv: Receiver, max: usize) -> Resul fn spawn_one(self: &Arc, workers: &mut JoinSet<()>, recv: Receiver) -> Result { let id = workers.len(); let self_ = self.clone(); + + #[cfg(not(tokio_unstable))] let _abort = workers.spawn_blocking_on(move || self_.worker(id, recv), self.server.runtime()); + #[cfg(tokio_unstable)] + let _abort = workers + .build_task() + .name("conduwuit:dbpool") + .spawn_blocking_on(move || self_.worker(id, recv), self.server.runtime()); + Ok(()) }