You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/02/21 15:25:43 UTC
[camel-k] 01/02: Related to #1190: add more logs when patch fails
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0fc7c3b7a9d97abc6dbdef4597fb41e3cce1d03f
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Feb 21 10:49:42 2020 +0100
Related to #1190: add more logs when patch fails
---
pkg/cmd/builder/builder.go | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/pkg/cmd/builder/builder.go b/pkg/cmd/builder/builder.go
index 9561ef8..b8d2f28 100644
--- a/pkg/cmd/builder/builder.go
+++ b/pkg/cmd/builder/builder.go
@@ -60,13 +60,13 @@ func Run(namespace string, buildName string, taskName string) {
printVersion()
c, err := client.NewClient(false)
- exitOnError(err)
+ exitOnError(err, "")
ctx := cancellable.NewContext()
build := &v1.Build{}
exitOnError(
- c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: buildName}, build),
+ c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: buildName}, build), "",
)
var task *v1.BuilderTask
@@ -77,7 +77,7 @@ func Run(namespace string, buildName string, taskName string) {
}
if task == nil {
exitOnError(errors.Errorf("No task of type [%s] with name [%s] in build [%s/%s]",
- reflect.TypeOf(v1.BuilderTask{}).Name(), taskName, namespace, buildName))
+ reflect.TypeOf(v1.BuilderTask{}).Name(), taskName, namespace, buildName), "")
}
status := builder.New(c).Run(*task)
@@ -87,8 +87,11 @@ func Run(namespace string, buildName string, taskName string) {
target.Status.Failure = build.Status.Failure
// Patch the build status with the result
p, err := patch.PositiveMergePatch(build, target)
- exitOnError(err)
- exitOnError(c.Status().Patch(ctx, target, controller.ConstantPatch(types.MergePatchType, p)))
+ exitOnError(err, "cannot create merge patch")
+ exitOnError(
+ c.Status().Patch(ctx, target, controller.ConstantPatch(types.MergePatchType, p)),
+ fmt.Sprintf("\n--- patch ---\n%s\n-------------\n", string(p)),
+ )
build.Status = target.Status
switch build.Status.Phase {
@@ -100,9 +103,9 @@ func Run(namespace string, buildName string, taskName string) {
}
}
-func exitOnError(err error) {
+func exitOnError(err error, msg string) {
if err != nil {
- log.Error(err, "")
+ log.Error(err, msg)
os.Exit(1)
}
}