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.

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

Remove defers from main() to stop suppressing panics #1851

Merged
merged 1 commit into from
Oct 21, 2023
Merged
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions cmd/gomplate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ import (
)

func main() {
exitCode := 0
// defer the exit first, so it executes last, to let the deferred cancel run
defer func() { os.Exit(exitCode) }()
if err := run(); err != nil {
os.Exit(1)
}
}

func run() error {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

// need to strip os.Args[0] so we only pass the actual flags
err := cmd.Main(ctx, os.Args[1:], os.Stdin, os.Stdout, os.Stderr)
if err != nil {
exitCode = 1
}
return cmd.Main(ctx, os.Args[1:], os.Stdin, os.Stdout, os.Stderr)
}
Loading