GeneralBots/botserver
2
1
Fork 0
Code Activity Actions

fix: use std:🧵:spawn for sync-to-async bridges to avoid nested block_on panic
Some checks are pending
BotServer CI/CD / build (push) Waiting to run
Details

Browse source 
Root cause: new_current_thread().block_on() panics when called from within
an existing tokio runtime (including from spawn_blocking). Tokio doesn't
allow nested block_on() calls.

Fix: Use std:🧵:spawn to create a completely separate OS thread
with its own runtime, communicating via mpsc channel. This works from
any context: async, spawn_blocking, or sync.
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-03 12:12:59 -03:00
parent 21170faea9
commit b2a9c8213d
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/core/shared/utils.rs
View file

@ -53,17 +53,19 @@ pub async fn get_database_url() -> Result<String> {
pub fn get_database_url_sync() -> Result<String> {
let guard = SECRETS_MANAGER.read().map_err(|e| anyhow::anyhow!("Lock poisoned: {}", e))?;
if let Some(ref manager) = *guard {
if tokio::runtime::Handle::try_current().is_ok() {
let manager_clone = manager.clone();
let (tx, rx) = std::sync::mpsc::channel();
std::thread::spawn(move || {
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.map_err(|e| anyhow::anyhow!("Failed to create runtime: {}", e))?;
return rt.block_on(manager.get_database_url());
} else {
let rt = tokio::runtime::Runtime::new()
.map_err(|e| anyhow::anyhow!("Failed to create runtime: {}", e))?;
return rt.block_on(manager.get_database_url());
}
.build();
let result = match rt {
Ok(rt) => rt.block_on(manager_clone.get_database_url()),
Err(e) => Err(anyhow::anyhow!("Failed to create runtime: {}", e)),
};
let _ = tx.send(result);
});
return rx.recv().map_err(|e| anyhow::anyhow!("Channel error: {}", e))?;
}
Err(anyhow::anyhow!(
@ -84,15 +86,19 @@ pub fn get_secrets_manager_sync() -> Option<SecretsManager> {
pub fn get_work_path() -> String {
let sm = get_secrets_manager_sync();
if let Some(sm) = sm {
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.ok();
match rt {
Some(rt) => rt.block_on(sm.get_value("gbo/app", "work_path"))
.unwrap_or_else(|_| "./work".to_string()),
None => "./work".to_string(),
}
let (tx, rx) = std::sync::mpsc::channel();
std::thread::spawn(move || {
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build();
let result = match rt {
Some(rt) => rt.block_on(sm.get_value("gbo/app", "work_path"))
.unwrap_or_else(|_| "./work".to_string()),
None => "./work".to_string(),
};
let _ = tx.send(result);
});
rx.recv().unwrap_or_else(|_| "./work".to_string())
} else {
"./work".to_string()
}