From e40f1fa0fdf698ced51ea855dff91aeca14218c3 Mon Sep 17 00:00:00 2001 From: wille Date: Fri, 23 Aug 2024 20:11:37 +0200 Subject: [PATCH] Improve deployer logs --- internal/webhook/deployer.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/webhook/deployer.go b/internal/webhook/deployer.go index d6b0b0a..b799534 100644 --- a/internal/webhook/deployer.go +++ b/internal/webhook/deployer.go @@ -2,6 +2,7 @@ package webhook import ( "context" + "errors" "fmt" "net/http" "time" @@ -108,7 +109,7 @@ func createOrUpdatePullRequest( attempts := 0 for { - bothDone := true + finished := true select { case <-ctx.Done(): @@ -139,13 +140,14 @@ func createOrUpdatePullRequest( } if !done { - bothDone = false + finished = false + log.Info("Deployment in progress: " + status) } writeFlush(w, status) } - if bothDone { + if finished { break } @@ -156,7 +158,8 @@ func createOrUpdatePullRequest( if attempts > 600 { log.Info("Timeout waiting for deployments to be ready") http.Error(w, "Timeout waiting for deployments to be ready", http.StatusRequestTimeout) - break + + return nil, errors.New("Timeout waiting for deployments to be ready") } time.Sleep(1 * time.Second)