uses cmdutil from skycoin/dmsg#83

alexadhy · May 29, 2021 · 7f1d35d · 7f1d35d
1 parent 895d4a8
commit 7f1d35d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 87 deletions.
diff --git a/cmd/setup-node/commands/root.go b/cmd/setup-node/commands/root.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"context"
 	"encoding/json"
+	"github.com/skycoin/dmsg/cmdutil"
 	"io"
 	"io/ioutil"
 	"os"
@@ -91,7 +92,7 @@ var rootCmd = &cobra.Command{
 
 		m := prepareMetrics(log)
 
-		ctx, cancel := signalContext(context.Background(), log)
+		ctx, cancel := cmdutil.SignalContext(context.Background(), log)
 		defer cancel()
 
 		log.Fatal(sn.Serve(ctx, m))

diff --git a/cmd/setup-node/commands/subprocess_unix.go b/cmd/setup-node/commands/subprocess_unix.go
diff --git a/cmd/setup-node/commands/subprocess_windows.go b/cmd/setup-node/commands/subprocess_windows.go
diff --git a/cmd/skywire-visor/commands/root.go b/cmd/skywire-visor/commands/root.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"embed"
 	"fmt"
+	"github.com/skycoin/dmsg/cmdutil"
 	"io"
 	"io/fs"
 	"io/ioutil"
@@ -97,7 +98,7 @@ var rootCmd = &cobra.Command{
 			runBrowser(conf, log)
 		}
 
-		ctx, cancel := signalContext(context.Background(), log)
+		ctx, cancel := cmdutil.SignalContext(context.Background(), log)
 		defer cancel()
 
 		// Wait.

diff --git a/cmd/skywire-visor/commands/subprocess_unix.go b/cmd/skywire-visor/commands/subprocess_unix.go
@@ -3,14 +3,11 @@
 package commands
 
 import (
-	"context"
 	"os/exec"
 	"syscall"
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"github.com/skycoin/dmsg/cmdutil"
-
 	"github.com/skycoin/skywire/pkg/restart"
 )
 
@@ -45,7 +42,3 @@ func detachProcess(delayDuration time.Duration, log logrus.FieldLogger) {
 	}
 
 }
-
-func signalContext(ctx context.Context, log logrus.FieldLogger) (context.Context, context.CancelFunc) {
-	return cmdutil.SignalContext(ctx, log)
-}
diff --git a/cmd/skywire-visor/commands/subprocess_windows.go b/cmd/skywire-visor/commands/subprocess_windows.go
@@ -3,38 +3,10 @@
 package commands
 
 import (
-	"context"
-	"os"
-	"os/signal"
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"golang.org/x/sys/windows"
 )
 
 func detachProcess(_ time.Duration, _ logrus.FieldLogger) {
 }
-
-// signalContext is just wrapper for cmdutil.SignalContext with its signal uses windows specific signals
-func signalContext(ctx context.Context, log logrus.FieldLogger) (context.Context, context.CancelFunc) {
-	if log == nil {
-		log = logrus.New()
-	}
-
-	ctx, cancel := context.WithCancel(ctx)
-	ch := make(chan os.Signal)
-
-	signal.Notify(ch, []os.Signal{windows.SIGINT, windows.SIGTERM, windows.SIGQUIT}...)
-
-	go func() {
-		select {
-		case sig := <-ch:
-			log.WithField("signal", sig).
-				Info("Closing with received signal.")
-		case <-ctx.Done():
-		}
-		cancel()
-	}()
-
-	return ctx, cancel
-}