Skip to content

feat: Log received signal when shutting down #6933

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

Merged
kodiakhq merged 2 commits into from
Jan 19, 2023
Merged

feat: Log received signal when shutting down #6933

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd0555
Log received signal when shutting down
hermanschaaf Jan 18, 2023
58185a8
Merge branch 'main' into improve-exit-log-message
kodiakhq[bot] Jan 19, 2023
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
23 changes: 18 additions & 5 deletions cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"os"
"os/signal"
"runtime/debug"
"sync"
"syscall"

"github.com/cloudquery/cloudquery/cli/cmd"
"github.com/getsentry/sentry-go"
Expand All @@ -15,23 +17,34 @@ import (

func executeRootCmdWithContext() error {
ctx := context.Background()
// trap Ctrl+C and call cancel on the context
// trap Ctrl+C and other signals, then call cancel on the context
ctx, cancel := context.WithCancel(ctx)
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
defer func() {
signal.Stop(c)
cancel()
}()
var gotSignal os.Signal
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
select {
case <-c:
case gotSignal = <-c:
cancel()
case <-ctx.Done():
}
}()

return cmd.NewCmdRoot().ExecuteContext(ctx)
err := cmd.NewCmdRoot().ExecuteContext(ctx)
cancel()
wg.Wait()
if gotSignal != nil && err != nil {
err = fmt.Errorf("received %v signal from OS: %w", gotSignal.String(), err)
} else if gotSignal != nil {
err = fmt.Errorf("received %v signal from OS", gotSignal.String())
}
return err
}

func main() {
Expand Down