diff --git a/bin/core/src/api/execute/mod.rs b/bin/core/src/api/execute/mod.rs index dd52eba10..48d1bed02 100644 --- a/bin/core/src/api/execute/mod.rs +++ b/bin/core/src/api/execute/mod.rs @@ -64,7 +64,7 @@ pub fn router() -> Router { let res = tokio::spawn(async move { let res = State.resolve_request(request, user).await; if let Err(e) = &res { - info!("/execute request {req_id} ERROR: {e:#?}"); + info!("/execute request {req_id} ERROR: {e:#}"); } let elapsed = timer.elapsed(); info!( @@ -75,7 +75,7 @@ pub fn router() -> Router { .await .context("failure in spawned execute task"); if let Err(e) = &res { - info!("/execute request {req_id} SPAWN ERROR: {e:#?}",); + info!("/execute request {req_id} SPAWN ERROR: {e:#}",); } AppResult::Ok((TypedHeader(ContentType::json()), res??)) }, diff --git a/bin/core/src/api/execute/repo.rs b/bin/core/src/api/execute/repo.rs index 1f0b4efcb..3de2af954 100644 --- a/bin/core/src/api/execute/repo.rs +++ b/bin/core/src/api/execute/repo.rs @@ -93,7 +93,7 @@ impl Resolve for State { .await; if let Err(e) = res { warn!( - "failed to update repo last_pulled_at | repo id: {} | {e:#?}", + "failed to update repo last_pulled_at | repo id: {} | {e:#}", repo.id ); } @@ -195,7 +195,7 @@ impl Resolve for State { .await; if let Err(e) = res { warn!( - "failed to update repo last_pulled_at | repo id: {} | {e:#?}", + "failed to update repo last_pulled_at | repo id: {} | {e:#}", repo.id ); } diff --git a/bin/core/src/api/read/mod.rs b/bin/core/src/api/read/mod.rs index c69afc300..0583e2d25 100644 --- a/bin/core/src/api/read/mod.rs +++ b/bin/core/src/api/read/mod.rs @@ -147,7 +147,7 @@ pub fn router() -> Router { ); let res = State.resolve_request(request, user).await; if let Err(e) = &res { - warn!("/read request {req_id} ERROR: {e:#?}"); + warn!("/read request {req_id} ERROR: {e:#}"); } let res = res?; let elapsed = timer.elapsed(); diff --git a/bin/core/src/api/write/mod.rs b/bin/core/src/api/write/mod.rs index 3c673e1da..77dce87e4 100644 --- a/bin/core/src/api/write/mod.rs +++ b/bin/core/src/api/write/mod.rs @@ -119,7 +119,7 @@ pub fn router() -> Router { let res = tokio::spawn(async move { let res = State.resolve_request(request, user).await; if let Err(e) = &res { - info!("/write request {req_id} ERROR: {e:#?}"); + info!("/write request {req_id} ERROR: {e:#}"); } let elapsed = timer.elapsed(); info!( @@ -129,7 +129,7 @@ pub fn router() -> Router { }) .await; if let Err(e) = &res { - info!("/write request {req_id} SPAWN ERROR: {e:#?}"); + info!("/write request {req_id} SPAWN ERROR: {e:#}"); } AppResult::Ok((TypedHeader(ContentType::json()), res??)) }, diff --git a/bin/core/src/helpers/alert.rs b/bin/core/src/helpers/alert.rs index 157ab7067..395ae3604 100644 --- a/bin/core/src/helpers/alert.rs +++ b/bin/core/src/helpers/alert.rs @@ -25,7 +25,7 @@ pub async fn send_alerts(alerts: &[Alert]) { .await; if let Err(e) = alerters { - error!("ERROR sending alerts | failed to get alerters from db | {e:#?}"); + error!("ERROR sending alerts | failed to get alerters from db | {e:#}"); return; } @@ -67,7 +67,7 @@ async fn send_alert(alerters: &[Alerter], alert: &Alert) { .await .into_iter() .filter_map(|res| res.err()) - .for_each(|e| error!("{e:#?}")); + .for_each(|e| error!("{e:#}")); } async fn send_custom_alert( diff --git a/bin/core/src/helpers/procedure.rs b/bin/core/src/helpers/procedure.rs index c62e0e038..6f8568c4e 100644 --- a/bin/core/src/helpers/procedure.rs +++ b/bin/core/src/helpers/procedure.rs @@ -27,7 +27,7 @@ async fn add_line_to_update(update: &Mutex, line: &str) { let update = lock.clone(); drop(lock); if let Err(e) = update_update(update).await { - error!("failed to update an update during procedure | {e:#?}"); + error!("failed to update an update during procedure | {e:#}"); }; } diff --git a/bin/core/src/listener/github.rs b/bin/core/src/listener/github.rs index a20a6204c..3e1e7926e 100644 --- a/bin/core/src/listener/github.rs +++ b/bin/core/src/listener/github.rs @@ -32,7 +32,7 @@ pub fn router() -> Router { tokio::spawn(async move { let res = handle_build_webhook(id.clone(), headers, body).await; if let Err(e) = res { - warn!("failed to run build webook for build {id} | {e:#?}"); + warn!("failed to run build webook for build {id} | {e:#}"); } }); }, @@ -45,7 +45,7 @@ pub fn router() -> Router { tokio::spawn(async move { let res = handle_repo_clone_webhook(id.clone(), headers, body).await; if let Err(e) = res { - warn!("failed to run repo clone webook for repo {id} | {e:#?}"); + warn!("failed to run repo clone webook for repo {id} | {e:#}"); } }); }, @@ -58,7 +58,7 @@ pub fn router() -> Router { tokio::spawn(async move { let res = handle_repo_pull_webhook(id.clone(), headers, body).await; if let Err(e) = res { - warn!("failed to run repo clone webook for repo {id} | {e:#?}"); + warn!("failed to run repo clone webook for repo {id} | {e:#}"); } }); }, diff --git a/bin/core/src/monitor/alert/deployment.rs b/bin/core/src/monitor/alert/deployment.rs index 5491f210b..552180123 100644 --- a/bin/core/src/monitor/alert/deployment.rs +++ b/bin/core/src/monitor/alert/deployment.rs @@ -67,7 +67,7 @@ pub async fn alert_deployments( let res = db_client().await.alerts.insert_many(alerts, None).await; if let Err(e) = res { error!( - "failed to record deployment status alerts to db | {e:#?}" + "failed to record deployment status alerts to db | {e:#}" ); } } diff --git a/bin/core/src/monitor/alert/server.rs b/bin/core/src/monitor/alert/server.rs index dcf3ebecb..4e90f7bde 100644 --- a/bin/core/src/monitor/alert/server.rs +++ b/bin/core/src/monitor/alert/server.rs @@ -36,7 +36,7 @@ pub async fn alert_servers( let alerts = get_open_alerts().await; if let Err(e) = alerts { - error!("{e:#?}"); + error!("{e:#}"); return; } @@ -502,7 +502,7 @@ async fn update_alerts(alerts: &[(Alert, SendAlerts)]) { .filter_map(|update| match update { Ok(update) => Some(update), Err(e) => { - warn!("failed to generate bulk update for alert | {e:#?}"); + warn!("failed to generate bulk update for alert | {e:#}"); None } }).collect::>(); @@ -529,7 +529,7 @@ async fn update_alerts(alerts: &[(Alert, SendAlerts)]) { let (res, _) = tokio::join!(open(), send_alerts(&alerts)); if let Err(e) = res { - error!("failed to create alerts on db | {e:#?}"); + error!("failed to create alerts on db | {e:#}"); } } diff --git a/bin/core/src/monitor/mod.rs b/bin/core/src/monitor/mod.rs index e2c4002b4..5c4643aed 100644 --- a/bin/core/src/monitor/mod.rs +++ b/bin/core/src/monitor/mod.rs @@ -61,8 +61,8 @@ pub fn spawn_monitor_loop() { Ok(servers) => servers, Err(e) => { error!( - "failed to get server list (manage status cache) | {e:#?}" - ); + "failed to get server list (manage status cache) | {e:#}" + ); continue; } }; @@ -85,7 +85,7 @@ pub async fn update_cache_for_server(server: &Server) { { Ok(deployments) => deployments, Err(e) => { - error!("failed to get deployments list from mongo (update status cache) | server id: {} | {e:#?}", server.id); + error!("failed to get deployments list from mongo (update status cache) | server id: {} | {e:#}", server.id); return; } }; @@ -153,7 +153,7 @@ pub async fn update_cache_for_server(server: &Server) { insert_deployments_status_unknown(deployments).await; return; } - + let containers = containers.unwrap(); let status_cache = deployment_status_cache(); for deployment in deployments { diff --git a/bin/core/src/monitor/record.rs b/bin/core/src/monitor/record.rs index d0aafa56c..0e13b0422 100644 --- a/bin/core/src/monitor/record.rs +++ b/bin/core/src/monitor/record.rs @@ -37,7 +37,7 @@ pub async fn record_server_stats(ts: i64) { let res = db_client().await.stats.insert_many(records, None).await; if let Err(e) = res { - error!("failed to record server stats | {e:#?}"); + error!("failed to record server stats | {e:#}"); } } } diff --git a/bin/periphery/src/main.rs b/bin/periphery/src/main.rs index 27dbd9a75..f83c3053e 100644 --- a/bin/periphery/src/main.rs +++ b/bin/periphery/src/main.rs @@ -3,7 +3,7 @@ extern crate tracing; use std::{net::SocketAddr, str::FromStr, time::Instant}; -use anyhow::Context; +use anyhow::{anyhow, Context}; use axum::{middleware, routing::post, Json, Router}; use axum_extra::{headers::ContentType, TypedHeader}; @@ -43,19 +43,27 @@ async fn app() -> anyhow::Result<()> { let res = tokio::spawn(async move { let res = State.resolve_request(request, ()).await; if let Err(e) = &res { - debug!("request {req_id} ERROR: {e:#?}"); + debug!("request {req_id} ERROR: {e:#}"); } let elapsed = timer.elapsed(); info!("request {req_id} | resolve time: {elapsed:?}"); res }) .await; - if let Err(e) = &res { - debug!("request {req_id} SPAWN ERROR: {e:#?}"); + match res { + Err(e) => { + debug!("request {req_id} spawn error: {e:#}"); + AppResult::Err(anyhow!("spawn error: {e:#}").into()) + } + Ok(Err(e)) => { + debug!("request {req_id} resolver error: {e:#}"); + AppResult::Err(e.context("resolver error").into()) + } + Ok(Ok(res)) => { + debug!("request {req_id} RESPONSE: {res}"); + AppResult::Ok((TypedHeader(ContentType::json()), res)) + } } - let res = res??; - debug!("request {req_id} RESPONSE: {res}"); - AppResult::Ok((TypedHeader(ContentType::json()), res)) }), ) .layer(middleware::from_fn(guard::guard_request_by_ip))