Skip to content

fix: Trap terminate signal, log which signal we received #658

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
merged 3 commits into from
Feb 6, 2023
Merged

fix: Trap terminate signal, log which signal we received #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4baef29
Trap interrup signal, log which signal we received
hermanschaaf Feb 2, 2023
31b32c6
Source -> Destination
hermanschaaf Feb 2, 2023
9728a0e
Merge branch 'main' into log-signals
kodiakhq[bot] Feb 6, 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
7 changes: 4 additions & 3 deletions serve/destination.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os/signal"
"strings"
"sync"
"syscall"

pbv0 "github.com/cloudquery/plugin-sdk/internal/pb/destination/v0"
pbdiscoveryv0 "github.com/cloudquery/plugin-sdk/internal/pb/discovery/v0"
Expand Down Expand Up @@ -145,15 +146,15 @@ func newCmdDestinationServe(serve *destinationServe) *cobra.Command {
}
ctx := cmd.Context()
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
defer func() {
signal.Stop(c)
}()

go func() {
select {
case <-c:
logger.Info().Str("address", listener.Addr().String()).Msg("Got interrupt. Destination plugin server shutting down")
case sig := <-c:
logger.Info().Str("address", listener.Addr().String()).Str("signal", sig.String()).Msg("Got stop signal. Destination plugin server shutting down")
s.Stop()
case <-ctx.Done():
logger.Info().Str("address", listener.Addr().String()).Msg("Context cancelled. Destination plugin server shutting down")
Expand Down
7 changes: 4 additions & 3 deletions serve/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os/signal"
"strings"
"sync"
"syscall"

pbdiscoveryv0 "github.com/cloudquery/plugin-sdk/internal/pb/discovery/v0"
pbv0 "github.com/cloudquery/plugin-sdk/internal/pb/source/v0"
Expand Down Expand Up @@ -160,15 +161,15 @@ func newCmdSourceServe(serve *sourceServe) *cobra.Command {

ctx := cmd.Context()
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
defer func() {
signal.Stop(c)
}()

go func() {
select {
case <-c:
logger.Info().Str("address", listener.Addr().String()).Msg("Got interrupt. Source plugin server shutting down")
case sig := <-c:
logger.Info().Str("address", listener.Addr().String()).Str("signal", sig.String()).Msg("Got stop signal. Source plugin server shutting down")
s.Stop()
case <-ctx.Done():
logger.Info().Str("address", listener.Addr().String()).Msg("Context cancelled. Source plugin server shutting down")
Expand Down