From c866a0b37cf261e166ec3de9019e633e36bd01a1 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 22 Apr 2021 11:25:31 +0700 Subject: [PATCH] removed signalctx, added NotifyContext Signed-off-by: Mikhail --- Dockerfile | 2 +- main.go | 14 +++++++++++--- pkg/imports/imports_linux.go | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a252f1d..1593263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15-buster as go +FROM golang:1.16-buster as go ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin diff --git a/main.go b/main.go index 3da04a3..091ec05 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,8 @@ import ( "context" "net/url" "os" + "os/signal" + "syscall" "time" "github.com/networkservicemesh/sdk/pkg/tools/jaeger" @@ -38,7 +40,6 @@ import ( "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" "github.com/networkservicemesh/sdk/pkg/tools/log" "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" - "github.com/networkservicemesh/sdk/pkg/tools/signalctx" ) // Config is configuration for cmd-registry-memory @@ -50,8 +51,15 @@ type Config struct { func main() { // Setup context to catch signals - ctx := signalctx.WithSignals(context.Background()) - ctx, cancel := context.WithCancel(ctx) + ctx, cancel := signal.NotifyContext( + context.Background(), + os.Interrupt, + // More Linux signals here + syscall.SIGHUP, + syscall.SIGTERM, + syscall.SIGQUIT, + ) + defer cancel() // Setup logging logrus.SetFormatter(&nested.Formatter{}) diff --git a/pkg/imports/imports_linux.go b/pkg/imports/imports_linux.go index 353b342..8069d0d 100644 --- a/pkg/imports/imports_linux.go +++ b/pkg/imports/imports_linux.go @@ -19,7 +19,6 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/log" _ "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" _ "github.com/networkservicemesh/sdk/pkg/tools/opentracing" - _ "github.com/networkservicemesh/sdk/pkg/tools/signalctx" _ "github.com/networkservicemesh/sdk/pkg/tools/spire" _ "github.com/sirupsen/logrus" _ "github.com/spiffe/go-spiffe/v2/bundle/x509bundle" @@ -33,7 +32,9 @@ import ( _ "google.golang.org/grpc/health/grpc_health_v1" _ "net/url" _ "os" + _ "os/signal" _ "path/filepath" + _ "syscall" _ "testing" _ "time" )