Skip to content

Commit

Permalink
revert this
Browse files Browse the repository at this point in the history
  • Loading branch information
isubasinghe committed Aug 1, 2023
1 parent 34691e6 commit fb870fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions cmd/workflow-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ func initConfig() {
}

func main() {
log.SetReportCaller(true)
if err := NewRootCommand().Execute(); err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down
1 change: 1 addition & 0 deletions workflow/controller/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
)

func (woc *wfOperationCtx) executeWfLifeCycleHook(ctx context.Context, tmplCtx *templateresolution.Context) (bool, error) {
woc.log.Infof("DEBUG- executeWFLifeCycleHook")
var hookNodes []*wfv1.NodeStatus
for hookName, hook := range woc.execWf.Spec.Hooks {
//exit hook will be executed in runOnExitNode
Expand Down
4 changes: 2 additions & 2 deletions workflow/controller/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ func (woc *wfOperationCtx) operate(ctx context.Context) {
}
// This strconv.Quote is necessary so that the escaped quotes are not removed during parameter substitution
woc.globalParams[common.GlobalVarWorkflowFailures] = strconv.Quote(string(failedNodeBytes))

woc.log.Infof("Calling executeWfLifeCycleHook")
hookCompleted, err := woc.executeWfLifeCycleHook(ctx, tmplCtx)
if err != nil {
woc.markNodeError(node.Name, err)
Expand Down Expand Up @@ -1757,7 +1757,7 @@ type executeTemplateOpts struct {
// nodeName is the name to be used as the name of the node, and boundaryID indicates which template
// boundary this node belongs to.
func (woc *wfOperationCtx) executeTemplate(ctx context.Context, nodeName string, orgTmpl wfv1.TemplateReferenceHolder, tmplCtx *templateresolution.Context, args wfv1.Arguments, opts *executeTemplateOpts) (*wfv1.NodeStatus, error) {
woc.log.Debugf("Evaluating node %s: template: %s, boundaryID: %s", nodeName, common.GetTemplateHolderString(orgTmpl), opts.boundaryID)
woc.log.Infof("Evaluating node %s: template: %s, boundaryID: %s", nodeName, common.GetTemplateHolderString(orgTmpl), opts.boundaryID)

// Set templateScope from which the template resolution starts.
templateScope := tmplCtx.GetTemplateScope()
Expand Down

0 comments on commit fb870fc

Please sign in to comment.