From 06807a76b687bd292e48b169d36369a88d4417d0 Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Sun, 3 Mar 2024 07:46:57 -0800 Subject: [PATCH] Use mutex prior to blocking on async for DB --- moss/src/db/mod.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/moss/src/db/mod.rs b/moss/src/db/mod.rs index 9f8d47a2..ad8bc959 100644 --- a/moss/src/db/mod.rs +++ b/moss/src/db/mod.rs @@ -2,10 +2,12 @@ // // SPDX-License-Identifier: MPL-2.0 -use std::{future::Future, sync::Arc}; +use std::{ + future::Future, + sync::{Arc, Mutex}, +}; use sqlx::Sqlite; -use tokio::sync::Mutex; use crate::runtime; @@ -25,9 +27,8 @@ impl Pool { where F: Future, { - runtime::block_on(async { - let pool = self.0.lock().await.clone(); - f(pool).await - }) + let _guard = self.0.lock().expect("mutex guard"); + let pool = _guard.clone(); + runtime::block_on(f(pool)) } }