Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move render events to after template command #1370

Merged
merged 2 commits into from
Apr 23, 2020
Merged

move render events to after template command #1370

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cce27b3
move render events to after template command
eikenb Apr 21, 2020
7a1c3e4
add note about 0s command_timeout behaviour
eikenb Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions manager/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,23 +556,6 @@ func (r *Runner) Run() error {
}
}

// Check if we need to deliver any rendered signals
if wouldRenderAny || renderedAny {
// Send the signal that a template got rendered
select {
case r.renderedCh <- struct{}{}:
default:
}
}

// Check if we need to deliver any event signals
if newRenderEvent {
select {
case r.renderEventCh <- struct{}{}:
default:
}
}

// Perform the diff and update the known dependencies.
r.diffAndUpdateDeps(runCtx.depsMap)

Expand Down Expand Up @@ -601,6 +584,23 @@ func (r *Runner) Run() error {
}
}

// Check if we need to deliver any rendered signals
if wouldRenderAny || renderedAny {
// Send the signal that a template got rendered
select {
case r.renderedCh <- struct{}{}:
default:
}
}

// Check if we need to deliver any event signals
if newRenderEvent {
select {
case r.renderEventCh <- struct{}{}:
default:
}
}

// If we got this far and have a child process, we need to send the reload
// signal to the child process.
if renderedAny && r.child != nil {
Expand Down