Skip to content

Refactor spawn_blocking error propagation #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cylae merged 1 commit into from
Sep 13, 2026
Merged

Refactor spawn_blocking error propagation #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added server_manager/.users.yaml.lock
View file
Open in desktop
Empty file.
8 changes: 2 additions & 6 deletions server_manager/src/core/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ impl Config {
Self::load_from(&Self::get_config_path())
}
pub async fn load_async() -> Result<Self> {
tokio::task::spawn_blocking(Self::load)
.await
.context("Failed to join blocking task")?
tokio::task::spawn_blocking(Self::load).await?
}

pub fn save_to(&self, path: &Path) -> Result<()> {
Expand Down Expand Up @@ -93,9 +91,7 @@ impl Config {
{
let path = Self::get_config_path();
let name = name.to_owned();
tokio::task::spawn_blocking(move || Self::update_service_at(&path, &name, update))
.await
.context("Failed to join blocking task")?
tokio::task::spawn_blocking(move || Self::update_service_at(&path, &name, update)).await?
}
pub async fn enable_service_async(name: &str) -> Result<()> {
Self::update_service_async(name, |cfg, name| cfg.disabled_services.remove(name)).await
Expand Down
9 changes: 5 additions & 4 deletions server_manager/src/core/users.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ pub struct UserManager {

impl UserManager {
pub async fn load_async() -> Result<Self> {
tokio::task::spawn_blocking(Self::load)
.await
.context("Failed to join blocking task")?
tokio::task::spawn_blocking(Self::load).await?
}

pub fn load() -> Result<Self> {
Expand Down Expand Up @@ -399,7 +397,10 @@ impl UserManager {

let is_valid = tokio::task::spawn_blocking(move || verify_password(&password, &hash))
.await
.unwrap_or(false);
.unwrap_or_else(|e| {
log::error!("Task join error during password verification: {}", e);
false
});

if is_valid {
return Some(user_clone);
Expand Down
89 changes: 28 additions & 61 deletions server_manager/src/interface/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,10 @@ pub async fn start_server(bind: &str, port: u16) -> anyhow::Result<()> {
)
})
.await
.unwrap_or((0, 0, 0, 0, 0.0, 0, 0));
.unwrap_or_else(|e| {
error!("Telemetry task join error: {}", e);
(0, 0, 0, 0, 0.0, 0, 0)
});

let update_info = crate::core::updater::check_for_updates().unwrap_or(
crate::core::updater::UpdateInfo {
Expand Down Expand Up @@ -1157,20 +1160,14 @@ async fn add_user_handler(
let user_name = payload.username.clone();
let pass = payload.password.clone();

let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.add_user(&user_name, &pass, role_enum, quota_val)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in add_user: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in add_user"))
});

match res {
Ok(new_manager) => {
Expand Down Expand Up @@ -1237,20 +1234,14 @@ async fn update_user_handler(
let mut manager_clone = cache.manager.clone();

let u_name = username.clone();
let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.update_user_role_and_quota(&u_name, role_enum, quota_val)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in update_user: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in update_user"))
});

match res {
Ok(new_manager) => {
Expand Down Expand Up @@ -1297,20 +1288,14 @@ async fn delete_user_handler(
let mut manager_clone = cache.manager.clone();

let u_name = username.clone();
let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.delete_user(&u_name)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in delete_user: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in delete_user"))
});

match res {
Ok(new_manager) => {
Expand Down Expand Up @@ -1598,20 +1583,14 @@ async fn user_install_app_handler(
let u_name = user.username.clone();
let app_name = name.clone();

let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.install_user_app(&u_name, &app_name)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in install_user_app: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in install_user_app"))
});

if let Ok(new_manager) = res {
cache.manager = new_manager;
Expand Down Expand Up @@ -1649,20 +1628,14 @@ async fn user_uninstall_app_handler(
let u_name = user.username.clone();
let app_name = name.clone();

let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.uninstall_user_app(&u_name, &app_name)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in uninstall_user_app: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in uninstall_user_app"))
});

if let Ok(new_manager) = res {
cache.manager = new_manager;
Expand Down Expand Up @@ -1801,20 +1774,14 @@ async fn user_passwd_handler(
let u_name = user.username.clone();
let new_pass = payload.password.clone();

let res = match tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
let res = tokio::task::spawn_blocking(move || -> anyhow::Result<UserManager> {
manager_clone.update_password(&u_name, &new_pass)?;
Ok(manager_clone)
})
.await
{
Ok(r) => r,
Err(e) => {
error!("Blocking task join error in update_password: {}", e);
Err(anyhow::anyhow!(
"Internal server error: failed to join background task"
))
}
};
.unwrap_or_else(|e| {
Err(anyhow::Error::from(e).context("Blocking task join error in update_password"))
});

if let Ok(new_manager) = res {
cache.manager = new_manager;
Expand Down
Loading