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

chore: add debug logs around shutdownCh #2210

Merged
merged 7 commits into from
May 8, 2024
Merged

chore: add debug logs around shutdownCh #2210

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
670cd22
chore: add debug logs around shutdownCh
jackwotherspoon May 8, 2024
66e1419
chore: add additional debug logs
jackwotherspoon May 8, 2024
3e34687
chore: add another log entry
jackwotherspoon May 8, 2024
5b9a35f
chore: merge main
jackwotherspoon May 8, 2024
b62aec1
chore: remove auto-generated code
jackwotherspoon May 8, 2024
3aa5cad
chore: remove log entries without acccess to cmd
jackwotherspoon May 8, 2024
d865ae9
chore: address comments
jackwotherspoon May 8, 2024
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
9 changes: 8 additions & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,8 +1007,10 @@ func runSignalWrapper(cmd *Command) (err error) {
}
switch s {
case syscall.SIGINT:
cmd.logger.Debugf("Sending SIGINT signal for proxy to shutdown.")
shutdownCh <- errSigInt
case syscall.SIGTERM:
cmd.logger.Debugf("Sending SIGTERM signal for proxy to shutdown.")
if cmd.conf.ExitZeroOnSigterm {
shutdownCh <- errSigTermZero
} else {
Expand All @@ -1023,6 +1025,7 @@ func runSignalWrapper(cmd *Command) (err error) {
defer close(startCh)
p, err := proxy.NewClient(ctx, cmd.dialer, cmd.logger, cmd.conf)
if err != nil {
cmd.logger.Debugf("Error starting proxy: %v", err)
shutdownCh <- fmt.Errorf("unable to start: %v", err)
return
}
Expand Down Expand Up @@ -1131,7 +1134,11 @@ func runSignalWrapper(cmd *Command) (err error) {
)
}

go func() { shutdownCh <- p.Serve(ctx, notifyStarted) }()
go func() {
err := p.Serve(ctx, notifyStarted)
cmd.logger.Debugf("proxy server error: %v", err)
shutdownCh <- err
}()

err = <-shutdownCh
switch {
Expand Down
Loading