From 75c275c6008234f878f079064279f9dca53972d0 Mon Sep 17 00:00:00 2001 From: jffarge Date: Fri, 21 Jan 2022 17:44:58 +0100 Subject: [PATCH 1/2] fix: :bug: log error while removing buildkit instead of returning one Signed-off-by: jffarge --- util/buildkitd/buildkitd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/buildkitd/buildkitd.go b/util/buildkitd/buildkitd.go index 22ba299f..b849d6de 100644 --- a/util/buildkitd/buildkitd.go +++ b/util/buildkitd/buildkitd.go @@ -65,7 +65,7 @@ func checkBuildkit(ctx context.Context) error { lg.Debug().Msg("no buildkit daemon detected") if err := removeBuildkit(ctx); err != nil { - return err + lg.Debug().Msg("Error while removing Buildkit") } if err := installBuildkit(ctx); err != nil { From 6ef7c4c7647333bf1325c764b24da89fcddede30 Mon Sep 17 00:00:00 2001 From: jffarge Date: Fri, 28 Jan 2022 10:56:33 +0100 Subject: [PATCH 2/2] fix: :bug: improve message consistency + log error Signed-off-by: jffarge --- util/buildkitd/buildkitd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/buildkitd/buildkitd.go b/util/buildkitd/buildkitd.go index b849d6de..b62d67ee 100644 --- a/util/buildkitd/buildkitd.go +++ b/util/buildkitd/buildkitd.go @@ -65,7 +65,7 @@ func checkBuildkit(ctx context.Context) error { lg.Debug().Msg("no buildkit daemon detected") if err := removeBuildkit(ctx); err != nil { - lg.Debug().Msg("Error while removing Buildkit") + lg.Debug().Err(err).Msg("error while removing buildkit") } if err := installBuildkit(ctx); err != nil {