Merge branch 'graceful-shutdown' into 'initial-server'

Graceful shutdown

Make the server command to actually stop gracefully on SIGINT/TERM

See merge request !6

1 files changed, 16 insertions, 1 deletions

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 18aca2f71..83aa5b558 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -1,9 +1,24 @@
 package main
 
 import (
+	"os"
+	"os/signal"
+	"syscall"
+
 	"gitlab.com/gitlab-org/git-access-daemon/server"
 )
 
 func main() {
-	server.NewService().Serve("0.0.0.0:6666", server.CommandExecutorCallback)
+	ch := make(chan os.Signal)
+	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
+
+	service := server.NewService()
+	go func() {
+		service.Serve("0.0.0.0:6666", server.CommandExecutorCallback)
+	}()
+
+	select {
+	case <-ch:
+		service.Stop()
+	}
 }