From dc12f6f79d9f20d26b4c0cbcaa12414bebe9b9c9 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Tue, 30 Jan 2024 14:16:05 -0600
Subject: [PATCH] replace remaining web::block with spawn_blocking

---
 src/repo/sled.rs          | 12 ++++++------
 src/store/object_store.rs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/repo/sled.rs b/src/repo/sled.rs
index 5d4c4eb..b7ec63c 100644
--- a/src/repo/sled.rs
+++ b/src/repo/sled.rs
@@ -210,7 +210,7 @@ impl ProxyRepo for SledRepo {
         let proxy = self.proxy.clone();
         let inverse_proxy = self.inverse_proxy.clone();
 
-        actix_web::web::block(move || {
+        crate::sync::spawn_blocking("sled-io", move || {
             proxy.insert(url.as_str().as_bytes(), alias.to_bytes())?;
             inverse_proxy.insert(alias.to_bytes(), url.as_str().as_bytes())?;
 
@@ -232,7 +232,7 @@ impl ProxyRepo for SledRepo {
         let proxy = self.proxy.clone();
         let inverse_proxy = self.inverse_proxy.clone();
 
-        actix_web::web::block(move || {
+        crate::sync::spawn_blocking("sled-io", move || {
             if let Some(url) = inverse_proxy.remove(alias.to_bytes())? {
                 proxy.remove(url)?;
             }
@@ -1215,7 +1215,7 @@ impl HashRepo for SledRepo {
 
         let hash = hash.to_ivec();
 
-        let res = actix_web::web::block(move || {
+        let res = crate::sync::spawn_blocking("sled-io", move || {
             (&hashes, &hashes_inverse, &hash_identifiers).transaction(
                 |(hashes, hashes_inverse, hash_identifiers)| {
                     if hashes.get(hash.clone())?.is_some() {
@@ -1395,7 +1395,7 @@ impl HashRepo for SledRepo {
             Ok(v) as Result<Vec<_>, SledError>
         });
 
-        let res = actix_web::web::block(move || {
+        let res = crate::sync::spawn_blocking("sled-io", move || {
             (
                 &hashes,
                 &hashes_inverse,
@@ -1462,7 +1462,7 @@ impl AliasRepo for SledRepo {
         let hash_aliases = self.hash_aliases.clone();
         let alias_delete_tokens = self.alias_delete_tokens.clone();
 
-        let res = actix_web::web::block(move || {
+        let res = crate::sync::spawn_blocking("sled-io", move || {
             (&aliases, &alias_hashes, &hash_aliases, &alias_delete_tokens).transaction(
                 |(aliases, alias_hashes, hash_aliases, alias_delete_tokens)| {
                     if aliases.get(&alias)?.is_some() {
@@ -1539,7 +1539,7 @@ impl AliasRepo for SledRepo {
         let hash_aliases = self.hash_aliases.clone();
         let alias_delete_tokens = self.alias_delete_tokens.clone();
 
-        let res = actix_web::web::block(move || {
+        let res = crate::sync::spawn_blocking("sled-io", move || {
             (&aliases, &alias_hashes, &hash_aliases, &alias_delete_tokens).transaction(
                 |(aliases, alias_hashes, hash_aliases, alias_delete_tokens)| {
                     aliases.remove(&alias)?;
diff --git a/src/store/object_store.rs b/src/store/object_store.rs
index 08a8aac..01f75c8 100644
--- a/src/store/object_store.rs
+++ b/src/store/object_store.rs
@@ -613,7 +613,7 @@ impl ObjectStore {
         let length = buf.len();
 
         let hashing_span = tracing::debug_span!("Hashing request body");
-        let hash_string = actix_web::web::block(move || {
+        let hash_string = crate::sync::spawn_blocking("hash-buf", move || {
             let guard = hashing_span.enter();
             let mut hasher = md5::Md5::new();
             for bytes in buf {