scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-05 08:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix clippy await_holding_lock: drop RwLock guard before await in webhook setup

Browse source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-03-08 13:03:37 -04:00
parent 2355cd573d
commit 0ca9a309c0
1 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
crates/arc-api/src/serve.rs
View file

@ -168,39 +168,41 @@ pub async fn serve_command(args: ServeArgs, styles: &'static Styles) -> anyhow::
}
// Optionally start webhook listener
let webhook_manager = {
let webhook_app_id = {
let cfg = shared_config.read().expect("config lock poisoned");
match (&cfg.git.webhooks, &cfg.git.app_id) {
(Some(_webhook_config), Some(app_id)) => {
let secret = std::env::var("GITHUB_APP_WEBHOOK_SECRET").ok();
let private_key_pem = read_github_private_key();
match (secret, private_key_pem) {
(Some(secret), Some(pem)) => {
let app_id = app_id.clone();
drop(cfg);
match crate::github_webhooks::WebhookManager::start(
secret.into_bytes(),
&app_id,
&pem,
)
.await
{
Ok(manager) => Some(manager),
Err(err) => {
error!(error = %err, "Failed to start webhook listener");
None
}
}
}
_ => {
warn!("Webhook config present but GITHUB_APP_WEBHOOK_SECRET or GITHUB_APP_PRIVATE_KEY not set; skipping webhook listener");
None
}
}
}
(Some(_), Some(app_id)) => Some(app_id.clone()),
_ => None,
}
};
let webhook_manager = match webhook_app_id {
Some(app_id) => {
let secret = std::env::var("GITHUB_APP_WEBHOOK_SECRET").ok();
let private_key_pem = read_github_private_key();
match (secret, private_key_pem) {
(Some(secret), Some(pem)) => {
match crate::github_webhooks::WebhookManager::start(
secret.into_bytes(),
&app_id,
&pem,
)
.await
{
Ok(manager) => Some(manager),
Err(err) => {
error!(error = %err, "Failed to start webhook listener");
None
}
}
}
_ => {
warn!("Webhook config present but GITHUB_APP_WEBHOOK_SECRET or GITHUB_APP_PRIVATE_KEY not set; skipping webhook listener");
None
}
}
}
None => None,
};
// Spawn config polling task
let config_for_poll = Arc::clone(&shared_config);