GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

Fix panic: Cannot start a runtime from within a runtime in secrets module

Browse source 
Removed tokio::runtime::Handle::block_on() calls that were causing panics
when called from within async contexts. Now uses direct fallback to
environment variables instead.
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-03-17 15:04:40 -03:00
parent 282f3487c0
commit 492530ee77
1 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/core/secrets/mod.rs
View file

@ -198,15 +198,6 @@ impl SecretsManager {
} }
pub fn get_value_blocking(&self, path: &str, key: &str, default: &str) -> String { pub fn get_value_blocking(&self, path: &str, key: &str, default: &str) -> String {
// Try to get synchronously using blocking call
if let Ok(runtime) = tokio::runtime::Handle::try_current() {
if let Ok(secrets) = runtime.block_on(self.get_secret(path)) {
if let Some(value) = secrets.get(key) {
return value.clone();
}
}
}
// Fallback to env defaults
if let Ok(secrets) = Self::get_from_env(path) { if let Ok(secrets) = Self::get_from_env(path) {
if let Some(value) = secrets.get(key) { if let Some(value) = secrets.get(key) {
return value.clone(); return value.clone();
@ -216,32 +207,26 @@ impl SecretsManager {
} }
pub fn get_drive_config(&self) -> (String, String, String) { pub fn get_drive_config(&self) -> (String, String, String) {
if let Ok(runtime) = tokio::runtime::Handle::try_current() { if let Ok(secrets) = Self::get_from_env(SecretPaths::DRIVE) {
if let Ok(secrets) = runtime.block_on(self.get_secret(SecretPaths::DRIVE)) { return (
return ( secrets.get("host").cloned().unwrap_or_else(|| "localhost:9100".to_string()),
secrets.get("host").cloned().unwrap_or_else(|| "localhost:9100".into()), secrets.get("accesskey").cloned().unwrap_or_else(|| "minioadmin".to_string()),
secrets.get("accesskey").cloned().unwrap_or_else(|| "minioadmin".into()), secrets.get("secret").cloned().unwrap_or_else(|| "minioadmin".to_string()),
secrets.get("secret").cloned().unwrap_or_else(|| "minioadmin".into()), );
);
}
} }
// Fallback
("localhost:9100".to_string(), "minioadmin".to_string(), "minioadmin".to_string()) ("localhost:9100".to_string(), "minioadmin".to_string(), "minioadmin".to_string())
} }
pub fn get_database_config_sync(&self) -> (String, u16, String, String, String) { pub fn get_database_config_sync(&self) -> (String, u16, String, String, String) {
if let Ok(runtime) = tokio::runtime::Handle::try_current() { if let Ok(secrets) = Self::get_from_env(SecretPaths::TABLES) {
if let Ok(secrets) = runtime.block_on(self.get_secret(SecretPaths::TABLES)) { return (
return ( secrets.get("host").cloned().unwrap_or_else(|| "localhost".to_string()),
secrets.get("host").cloned().unwrap_or_else(|| "localhost".into()), secrets.get("port").and_then(|p| p.parse().ok()).unwrap_or(5432),
secrets.get("port").and_then(|p| p.parse().ok()).unwrap_or(5432), secrets.get("database").cloned().unwrap_or_else(|| "botserver".to_string()),
secrets.get("database").cloned().unwrap_or_else(|| "botserver".into()), secrets.get("username").cloned().unwrap_or_else(|| "gbuser".to_string()),
secrets.get("username").cloned().unwrap_or_else(|| "gbuser".into()), secrets.get("password").cloned().unwrap_or_default(),
secrets.get("password").cloned().unwrap_or_default(), );
);
}
} }
// Fallback
("localhost".to_string(), 5432, "botserver".to_string(), "gbuser".to_string(), "changeme".to_string()) ("localhost".to_string(), 5432, "botserver".to_string(), "gbuser".to_string(), "changeme".to_string())
} }