Merge pull request #94 from Mixaster995/main

fix networkservicemesh/sdk#759 - removed signalctx, added NotifyContext

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

main.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"net/url"
 	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/networkservicemesh/sdk-k8s/pkg/registry/chains/registryk8s"
@@ -39,7 +41,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
@@ -51,8 +52,15 @@ type Config struct {
 func main() {
 	var config = new(Config)
 	// 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{})

pkg/internal/imports/imports.go

@@ -21,5 +21,7 @@ import (
 	_ "google.golang.org/grpc/credentials"
 	_ "net/url"
 	_ "os"
+	_ "os/signal"
+	_ "syscall"
 	_ "time"
 )