3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-10 15:47:36 +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 { func withInterrupt(ctx context.Context) context.Context {
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancelCause(ctx)
go func(ctx context.Context) { go func(ctx context.Context) {
defer cancel(context.Canceled)
ch := make(chan os.Signal, 2) ch := make(chan os.Signal, 2)
defer signal.Stop(ch) defer signal.Stop(ch)
@ -66,10 +68,9 @@ func withInterrupt(ctx context.Context) context.Context {
select { select {
case sig := <-ch: case sig := <-ch:
log.Ctx(ctx).Info().Str("signal", sig.String()).Msg("quitting...") cancel(fmt.Errorf("received signal: %s", sig))
case <-ctx.Done(): case <-ctx.Done():
} }
cancel()
}(ctx) }(ctx)
return ctx return ctx
} }

11
internal/zero/controller/controller.go
View file

@ -3,7 +3,6 @@ package controller
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"net" "net"
"net/url" "net/url"
@ -28,7 +27,6 @@ import (
// Run runs Pomerium is managed mode using the provided token. // Run runs Pomerium is managed mode using the provided token.
func Run(ctx context.Context, opts ...Option) error { func Run(ctx context.Context, opts ...Option) error {
c := controller{cfg: newControllerConfig(opts...)} c := controller{cfg: newControllerConfig(opts...)}
eg, ctx := errgroup.WithContext(ctx)
err := c.initAPI(ctx) err := c.initAPI(ctx)
if err != nil { if err != nil {
@ -58,11 +56,17 @@ func Run(ctx context.Context, opts ...Option) error {
} }
c.bootstrapConfig = src c.bootstrapConfig = src
eg, ctx := errgroup.WithContext(ctx)
eg.Go(func() error { return run(ctx, "connect", c.runConnect) }) eg.Go(func() error { return run(ctx, "connect", c.runConnect) })
eg.Go(func() error { return run(ctx, "connect-log", c.RunConnectLog) }) eg.Go(func() error { return run(ctx, "connect-log", c.RunConnectLog) })
eg.Go(func() error { return run(ctx, "zero-bootstrap", c.runBootstrap) }) eg.Go(func() error { return run(ctx, "zero-bootstrap", c.runBootstrap) })
eg.Go(func() error { return run(ctx, "pomerium-core", c.runPomeriumCore) }) eg.Go(func() error { return run(ctx, "pomerium-core", c.runPomeriumCore) })
eg.Go(func() error { return run(ctx, "zero-control-loop", c.runZeroControlLoop) }) eg.Go(func() error { return run(ctx, "zero-control-loop", c.runZeroControlLoop) })
eg.Go(func() error {
<-ctx.Done()
log.Ctx(ctx).Info().Msgf("shutting down: %v", context.Cause(ctx))
return nil
})
return eg.Wait() return eg.Wait()
} }
@ -91,8 +95,9 @@ func (c *controller) initAPI(ctx context.Context) error {
func run(ctx context.Context, name string, runFn func(context.Context) error) error { func run(ctx context.Context, name string, runFn func(context.Context) error) error {
log.Ctx(ctx).Debug().Str("name", name).Msg("starting") log.Ctx(ctx).Debug().Str("name", name).Msg("starting")
defer log.Ctx(ctx).Debug().Str("name", name).Msg("stopped")
err := runFn(ctx) err := runFn(ctx)
if err != nil && !errors.Is(err, context.Canceled) { if err != nil && ctx.Err() == nil {
return fmt.Errorf("%s: %w", name, err) return fmt.Errorf("%s: %w", name, err)
} }
return nil return nil