feat(grpc): adding shutdown method. (#108)

cmd/commands/run.go

@@ -6,6 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/dezh-tech/immortal"
 	"github.com/dezh-tech/immortal/cmd/relay"
 	"github.com/dezh-tech/immortal/config"
 	"github.com/dezh-tech/immortal/pkg/logger"
@@ -23,6 +24,8 @@ func HandleRun(args []string) {
 
 	logger.InitGlobalLogger(&cfg.Logger)
 
+	logger.Info("running immortal", "version", immortal.StringVersion())
+
 	r, err := relay.New(cfg)
 	if err != nil {
 		ExitOnError(err)
@@ -31,7 +34,9 @@ func HandleRun(args []string) {
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
 
-	errCh := r.Start()
+	shutdownch := make(chan struct{}, 1)
+
+	errCh := r.Start(shutdownch)
 
 	select {
 	case sig := <-sigChan:
@@ -45,5 +50,11 @@ func HandleRun(args []string) {
 		if err := r.Stop(); err != nil {
 			ExitOnError(err)
 		}
+
+	case shsig := <-shutdownch:
+		logger.Info("Received signal from manager over grpc: Initiating graceful shutdown", "signal", shsig)
+		if err := r.Stop(); err != nil {
+			ExitOnError(err)
+		}
 	}
 }

cmd/relay/relay.go

@@ -85,7 +85,7 @@ func New(cfg *config.Config) (*Relay, error) {
 }
 
 // Start runs the relay and its children.
-func (r *Relay) Start() chan error {
+func (r *Relay) Start(shutdownch chan struct{}) chan error {
 	logger.Info("starting the relay")
 
 	errCh := make(chan error, 2)
@@ -97,7 +97,7 @@ func (r *Relay) Start() chan error {
 	}()
 
 	go func() {
-		if err := r.grpcServer.Start(); err != nil {
+		if err := r.grpcServer.Start(shutdownch); err != nil {
 			errCh <- err
 		}
 	}()
@@ -121,5 +121,9 @@ func (r *Relay) Stop() error {
 		return err
 	}
 
+	if err := r.redis.Close(); err != nil {
+		return err
+	}
+
 	return nil
 }

delivery/grpc/proto/shutdown.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package relay.v1;
+
+option go_package = "github.com/dezh-tech/immortal/delivery/grpc";
+
+service ShutdownService {
+    rpc Shutdown (ShutdownRequest) returns (ShutdownResponse);
+}
+
+message ShutdownRequest {}
+
+message ShutdownResponse {}