fix: graceful shutdown (#134)

* fix: graceful shutdown

* fix: windows graceful shutdown

client/cmd/root.go

@@ -31,7 +31,8 @@ var (
 	}
 
 	// Execution control channel for stopCh signal
-	stopCh chan int
+	stopCh    chan int
+	cleanupCh chan struct{}
 )
 
 // Execute executes the root command.
@@ -41,6 +42,7 @@ func Execute() error {
 func init() {
 
 	stopCh = make(chan int)
+	cleanupCh = make(chan struct{})
 
 	defaultConfigPath = "/etc/wiretrustee/config.json"
 	defaultLogFile = "/var/log/wiretrustee/client.log"

client/cmd/service_controller.go

@@ -5,6 +5,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/wiretrustee/wiretrustee/util"
+	"time"
 )
 
 func (p *program) Start(s service.Service) error {
@@ -15,12 +16,19 @@ func (p *program) Start(s service.Service) error {
 		if err != nil {
 			return
 		}
-
 	}()
 	return nil
 }
 
 func (p *program) Stop(s service.Service) error {
+	stopCh <- 1
+
+	select {
+	case <-cleanupCh:
+	case <-time.After(time.Second * 10):
+		log.Warnf("failed waiting for service cleanup, terminating")
+	}
+	log.Info("stopped Wiretrustee service") //nolint
 	return nil
 }
 
@@ -29,11 +37,15 @@ var (
 		Use:   "run",
 		Short: "runs wiretrustee as service",
 		Run: func(cmd *cobra.Command, args []string) {
+
 			err := util.InitLog(logLevel, logFile)
 			if err != nil {
 				log.Errorf("failed initializing log %v", err)
 				return
 			}
+
+			SetupCloseHandler()
+
 			prg := &program{
 				cmd:  cmd,
 				args: args,

client/cmd/up.go

@@ -9,7 +9,6 @@ import (
 	mgm "github.com/wiretrustee/wiretrustee/management/client"
 	mgmProto "github.com/wiretrustee/wiretrustee/management/proto"
 	signal "github.com/wiretrustee/wiretrustee/signal/client"
-	"github.com/wiretrustee/wiretrustee/util"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -20,13 +19,8 @@ var (
 		Use:   "up",
 		Short: "install, login and start wiretrustee client",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := util.InitLog(logLevel, logFile)
-			if err != nil {
-				log.Errorf("failed initializing log %v", err)
-				return err
-			}
 
-			err = loginCmd.RunE(cmd, args)
+			err := loginCmd.RunE(cmd, args)
 			if err != nil {
 				return err
 			}
@@ -117,7 +111,7 @@ func connectToManagement(ctx context.Context, managementAddr string, ourPrivateK
 		}
 	}
 
-	log.Infof("peer logged in to Management Service %s", managementAddr)
+	log.Debugf("peer logged in to Management Service %s", managementAddr)
 
 	return client, loginResp, nil
 }
@@ -166,7 +160,7 @@ func runClient() error {
 	}
 
 	// create start the Wiretrustee Engine that will connect to the Signal and Management streams and manage connections to remote peers.
-	engine := internal.NewEngine(signalClient, mgmClient, engineConfig, cancel)
+	engine := internal.NewEngine(signalClient, mgmClient, engineConfig, cancel, ctx)
 	err = engine.Start()
 	if err != nil {
 		log.Errorf("error while starting Wiretrustee Connection Engine: %s", err)
@@ -175,14 +169,11 @@ func runClient() error {
 
 	log.Print("Wiretrustee engine started, my IP is: ", peerConfig.Address)
 
-	SetupCloseHandler()
-
 	select {
 	case <-stopCh:
 	case <-ctx.Done():
 	}
 
-	log.Info("shutting down Wiretrustee client")
 	err = mgmClient.Close()
 	if err != nil {
 		log.Errorf("failed closing Management Service client %v", err)
@@ -200,5 +191,8 @@ func runClient() error {
 		return err
 	}
 
+	log.Info("stopped Wiretrustee client")
+	cleanupCh <- struct{}{}
+
 	return nil
 }