From 075d7d4fefe41e82bf4c09bf57559c6cccd3287f Mon Sep 17 00:00:00 2001 From: Janos Dobronszki Date: Tue, 21 Apr 2020 14:14:20 +0200 Subject: [PATCH] Renaming ShutdownSignals -> Shutdown (#1553) --- server/server.go | 3 ++- service.go | 2 +- util/signal/signal.go | 2 +- web/service.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/server.go b/server/server.go index a22e90d2..21e05e9f 100644 --- a/server/server.go +++ b/server/server.go @@ -200,7 +200,8 @@ func Run() error { } ch := make(chan os.Signal, 1) - signal.Notify(ch, signalutil.ShutdownSignals()...) + signal.Notify(ch, signalutil.Shutdown()...) + if logger.V(logger.InfoLevel, log) { log.Infof("Received signal %s", <-ch) } diff --git a/service.go b/service.go index 982d7e17..a49c696f 100644 --- a/service.go +++ b/service.go @@ -210,7 +210,7 @@ func (s *service) Run() error { ch := make(chan os.Signal, 1) if s.opts.Signal { - signal.Notify(ch, signalutil.ShutdownSignals()...) + signal.Notify(ch, signalutil.Shutdown()...) } select { diff --git a/util/signal/signal.go b/util/signal/signal.go index 1060dc1a..bb5b7492 100644 --- a/util/signal/signal.go +++ b/util/signal/signal.go @@ -6,7 +6,7 @@ import ( ) // ShutDownSingals returns all the singals that are being watched for to shut down services. -func ShutdownSignals() []os.Signal { +func Shutdown() []os.Signal { return []os.Signal{ syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGKILL, } diff --git a/web/service.go b/web/service.go index 73b203db..81895f08 100644 --- a/web/service.go +++ b/web/service.go @@ -404,7 +404,7 @@ func (s *service) Run() error { ch := make(chan os.Signal, 1) if s.opts.Signal { - signal.Notify(ch, signalutil.ShutdownSignals()...) + signal.Notify(ch, signalutil.Shutdown()...) } select {