daemon: treat SIGTERM cancel as clean exit
This commit is contained in:
parent
08ee1e4fc8
commit
5343638b51
@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
@ -147,7 +148,10 @@ func runDaemon(logger *log.Logger, args []string) error {
|
|||||||
d := service.NewDaemon(cfg, orch, targets, logger)
|
d := service.NewDaemon(cfg, orch, targets, logger)
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||||
defer stop()
|
defer stop()
|
||||||
return d.Run(ctx)
|
if err := d.Run(ctx); err != nil && !errors.Is(err, context.Canceled) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func runStatus(logger *log.Logger, args []string) error {
|
func runStatus(logger *log.Logger, args []string) error {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user