From 8c4ad4b5348acbbbd4ca529f47dd4f5041ca42cf Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 12 Apr 2024 17:41:09 +0100 Subject: [PATCH] chore: clean up some logging --- src/server/actors/repo/branch.rs | 3 ++- src/server/actors/repo/status.rs | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/server/actors/repo/branch.rs b/src/server/actors/repo/branch.rs index cf7507b..452ac26 100644 --- a/src/server/actors/repo/branch.rs +++ b/src/server/actors/repo/branch.rs @@ -128,6 +128,7 @@ pub async fn advance_next( warn!("Can't advance next to commit '{}': {}", commit, problem); return; } + info!("Advancing next to commit '{}'", commit); match reset( &repo_config.branches().next(), commit, @@ -135,7 +136,6 @@ pub async fn advance_next( &repo_details, ) { Ok(_) => { - info!("Success"); // TODO : (#18) sleep and restart while we don't have webhooks tokio::time::sleep(std::time::Duration::from_secs(10)).await; addr.do_send(ValidateRepo); @@ -185,6 +185,7 @@ pub async fn advance_main( repo_details: config::RepoDetails, repo_config: config::RepoConfig, ) { + info!("Advancing main to next"); match reset( &repo_config.branches().main(), next, diff --git a/src/server/actors/repo/status.rs b/src/server/actors/repo/status.rs index 851e415..15bcfca 100644 --- a/src/server/actors/repo/status.rs +++ b/src/server/actors/repo/status.rs @@ -22,14 +22,12 @@ pub async fn check_next( forge::forgejo::get_commit_status(next.clone(), &repo_details, net).await } }; - info!(?status, "Checking next branch status"); + info!(?status, "Checking next branch"); match status { Status::Pass => { addr.do_send(AdvanceMainTo(next)); } - Status::Pending => { - info!("Checks are pending"); - } + Status::Pending => {} Status::Fail => { warn!("Checks have failed"); }