diff --git a/pkg/runner/helper.go b/pkg/runner/helper.go index d618c834..8670273a 100644 --- a/pkg/runner/helper.go +++ b/pkg/runner/helper.go @@ -23,11 +23,13 @@ type helper struct { name string runner *Runner log *logger.Entry + hasLog bool builder *resource.Builder cleanup func() } func (h *helper) Log() *logger.Entry { + h.hasLog = true return h.log } @@ -42,8 +44,15 @@ func (h *helper) Cleanup(f func(), args ...interface{}) { if oldCleanup != nil { defer oldCleanup() } - args = append([]interface{}{"clenaup "}, args...) - h.Log().Info(args...) + log := h.Log() + if len(args) > 0 { + if l, ok := args[0].(*logger.Entry); ok { + log = l + args = args[1:] + } + } + args = append([]interface{}{"cleanup "}, args...) + log.Info(args...) f() } } diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go index 1193bdda..b703132c 100644 --- a/pkg/runner/runner.go +++ b/pkg/runner/runner.go @@ -26,7 +26,6 @@ func (r *Runner) trigger(n string, f events.Action) (cleanup func(), err error) fields["as"] = r.alias } log := r.log.WithFields(fields) - log.Info("trigger") h := &helper{ name: n, @@ -42,6 +41,8 @@ func (r *Runner) trigger(n string, f events.Action) (cleanup func(), err error) if err := f(h); err != nil { log.WithError(err).Error("action error") + } else if !h.hasLog { + log.Info("action executed") } return h.cleanup, nil