3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-23 14:07:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

zero/cmd: make it more evident what caused shutdown (#5209)

Browse source
This commit is contained in:
Denis Mishin 2024-08-06 15:10:58 -04:00 • committed by GitHub
parent e2251b2d57
commit 09f1585b01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/zero/cmd/command.go
View file

@ -56,8 +56,10 @@ func IsManagedMode(configFile string) bool {
}
func withInterrupt(ctx context.Context) context.Context {
ctx, cancel := context.WithCancel(ctx)
ctx, cancel := context.WithCancelCause(ctx)
go func(ctx context.Context) {
defer cancel(context.Canceled)
ch := make(chan os.Signal, 2)
defer signal.Stop(ch)
@ -66,10 +68,9 @@ func withInterrupt(ctx context.Context) context.Context {
select {
case sig := <-ch:
log.Ctx(ctx).Info().Str("signal", sig.String()).Msg("quitting...")
cancel(fmt.Errorf("received signal: %s", sig))
case <-ctx.Done():
}
cancel()
}(ctx)
return ctx
}