Use go-cli ExecuteContext to handle termination signals

Signed-off-by: Carlos Martín <carlos.martin.sanchez@gmail.com>

Author: carlosms

cmd/lookoutd/common.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/signal"
 	"runtime"
 	"time"
 
@@ -24,7 +23,6 @@ import (
 	"github.com/src-d/lookout/store/models"
 	"github.com/src-d/lookout/util/cache"
 	"github.com/src-d/lookout/util/cli"
-	"github.com/src-d/lookout/util/ctxlog"
 	"github.com/src-d/lookout/util/grpchelper"
 
 	"github.com/gregjones/httpcache/diskcache"
@@ -452,13 +450,3 @@ func (c *queueConsumerCommand) runEventDequeuer(ctx context.Context, qOpt cli.Qu
 
 	return queue_util.RunEventDequeuer(ctx, qOpt.Q, server.HandleEvent, c.Workers)
 }
-
-func stopOnSignal(ctx context.Context) error {
-	var stopSignalChan = make(chan os.Signal)
-	signal.Notify(stopSignalChan, os.Interrupt)
-	sig := <-stopSignalChan
-
-	ctxlog.Get(ctx).Infof("Signal %s received. Stopping server...", sig)
-
-	return nil
-}

cmd/lookoutd/serve.go

@@ -20,8 +20,8 @@ type ServeCommand struct {
 	queueConsumerCommand
 }
 
-func (c *ServeCommand) Execute(args []string) error {
-	ctx, stopCtx := context.WithCancel(context.Background())
+func (c *ServeCommand) ExecuteContext(ctx context.Context, args []string) error {
+	ctx, stopCtx := context.WithCancel(ctx)
 	stopCh := make(chan error, 1)
 
 	cli.InitLog(&c.LogOptions, name)
@@ -88,32 +88,39 @@ func (c *ServeCommand) Execute(args []string) error {
 	startDataServer, stopDataServer := c.initDataServer(dataHandler)
 	go func() {
 		err := startDataServer()
-		ctxlog.Get(ctx).Errorf(err, "data server stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "data server stopped")
+		}
 		stopCh <- err
 	}()
 
 	go func() {
 		err := c.runEventDequeuer(ctx, qOpt, server)
-		ctxlog.Get(ctx).Errorf(err, "event dequeuer stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "event dequeuer stopped")
+		}
 		stopCh <- err
 	}()
 
 	go func() {
 		err := c.runEventEnqueuer(ctx, qOpt, watcher)
-		ctxlog.Get(ctx).Errorf(err, "event enqueuer stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "event enqueuer stopped")
+		}
 		stopCh <- err
 	}()
 
-	go func() {
-		stopCh <- stopOnSignal(ctx)
-	}()
-
 	c.probeReadiness = true
 
-	err = <-stopCh
+	select {
+	case <-ctx.Done():
+		err = ctx.Err()
+	case err = <-stopCh:
+		// stop the other servers that did not fail
+		stopCtx()
+	}
 
-	// stop servers gracefully
-	stopCtx()
+	// stop data server, it does not stop with context
 	stopDataServer()
 
 	return err

cmd/lookoutd/watch.go

@@ -18,8 +18,8 @@ type WatchCommand struct {
 	cli.QueueOptions
 }
 
-func (c *WatchCommand) Execute(args []string) error {
-	ctx, stopCtx := context.WithCancel(context.Background())
+func (c *WatchCommand) ExecuteContext(ctx context.Context, args []string) error {
+	ctx, stopCtx := context.WithCancel(ctx)
 	stopCh := make(chan error, 1)
 
 	cli.InitLog(&c.LogOptions, name)
@@ -53,20 +53,21 @@ func (c *WatchCommand) Execute(args []string) error {
 
 	go func() {
 		err := c.runEventEnqueuer(ctx, c.QueueOptions, watcher)
-		ctxlog.Get(ctx).Errorf(err, "event enqueuer stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "event enqueuer stopped")
+		}
 		stopCh <- err
 	}()
 
-	go func() {
-		stopCh <- stopOnSignal(ctx)
-	}()
-
 	c.probeReadiness = true
 
-	err = <-stopCh
-
-	// stop servers gracefully
-	stopCtx()
+	select {
+	case <-ctx.Done():
+		err = ctx.Err()
+	case err = <-stopCh:
+		// stop the other servers that did not fail
+		stopCtx()
+	}
 
 	return err
 }

cmd/lookoutd/work.go

@@ -21,8 +21,8 @@ type WorkCommand struct {
 	cli.QueueOptions
 }
 
-func (c *WorkCommand) Execute(args []string) error {
-	ctx, stopCtx := context.WithCancel(context.Background())
+func (c *WorkCommand) ExecuteContext(ctx context.Context, args []string) error {
+	ctx, stopCtx := context.WithCancel(ctx)
 	stopCh := make(chan error, 1)
 
 	cli.InitLog(&c.LogOptions, name)
@@ -81,28 +81,33 @@ func (c *WorkCommand) Execute(args []string) error {
 	startDataServer, stopDataServer := c.initDataServer(dataHandler)
 	go func() {
 		err := startDataServer()
-		ctxlog.Get(ctx).Errorf(err, "data server stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "data server stopped")
+		}
 		stopCh <- err
 	}()
 
 	go func() {
 		err := c.runEventDequeuer(ctx, c.QueueOptions, server)
-		ctxlog.Get(ctx).Errorf(err, "event dequeuer stopped")
+		if err != context.Canceled {
+			ctxlog.Get(ctx).Errorf(err, "event dequeuer stopped")
+		}
 		stopCh <- err
 	}()
 
-	go func() {
-		stopCh <- stopOnSignal(ctx)
-	}()
-
 	c.probeReadiness = true
 
 	ctxlog.Get(ctx).Infof("Worker started")
 
-	err = <-stopCh
+	select {
+	case <-ctx.Done():
+		err = ctx.Err()
+	case err = <-stopCh:
+		// stop the other servers that did not fail
+		stopCtx()
+	}
 
-	// stop servers gracefully
-	stopCtx()
+	// stop data server, it does not stop with context
 	stopDataServer()
 
 	return err