feature: Shutting down gracefully

Author: g3force

cmd/ssl-game-controller/main.go

@@ -7,6 +7,9 @@ import (
 	"github.com/gobuffalo/packr"
 	"log"
 	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
 )
 
 var address = flag.String("address", "localhost:8081", "The address on which the UI and API is served")
@@ -43,6 +46,15 @@ func setupGameController() {
 
 	gameController := gc.NewGameController(cfg)
 	gameController.Start()
+
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-sigs
+		gameController.Stop()
+		os.Exit(0)
+	}()
+
 	// serve the bidirectional web socket
 	http.HandleFunc("/api/control", gameController.ApiServer().WsHandler)
 }

internal/app/ci/ci.go

@@ -21,6 +21,7 @@ type Server struct {
 	tickChan   chan time.Time
 	mutex      sync.Mutex
 	gcEngine   *engine.Engine
+	running    bool
 }
 
 func NewServer(address string) *Server {
@@ -32,13 +33,16 @@ func (s *Server) SetEngine(engine *engine.Engine) {
 }
 
 func (s *Server) Start() {
+	s.running = true
 	go s.listen(s.address)
 }
 
 func (s *Server) Stop() {
+	s.running = false
 	if err := s.listener.Close(); err != nil {
 		log.Printf("Could not close listener: %v", err)
 	}
+	s.listener = nil
 }
 
 func (s *Server) listen(address string) {
@@ -50,7 +54,7 @@ func (s *Server) listen(address string) {
 	log.Print("Listening on ", address)
 	s.listener = listener
 
-	for {
+	for s.running {
 		conn, err := listener.Accept()
 		if err != nil {
 			log.Print("Could not accept connection: ", err)

internal/app/gc/gc.go

@@ -92,12 +92,21 @@ func (c *GameController) Start() {
 
 // Stop stops all go routines
 func (c *GameController) Stop() {
-	// Note: Stopping is not (yet) implemented correctly by all servers.
+
+	switch c.config.TimeAcquisitionMode {
+	case config.TimeAcquisitionModeSystem:
+		c.visionReceiver.Stop()
+		c.trackerReceiver.Stop()
+		break
+	case config.TimeAcquisitionModeVision:
+		c.visionReceiver.Stop()
+		c.trackerReceiver.Stop()
+	case config.TimeAcquisitionModeCi:
+		c.ciServer.Stop()
+	}
+
 	c.gcEngine.UnregisterHook("messageGen")
 	c.messageGenerator.Stop()
-	c.ciServer.Stop()
-	c.trackerReceiver.Stop()
-	c.visionReceiver.Stop()
 	c.autoRefServer.Server.Stop()
 	c.autoRefServerTls.Server.Stop()
 	c.teamServer.Server.Stop()

internal/app/publish/messagegenerator.go

@@ -25,6 +25,7 @@ func NewMessageGenerator() (m *MessageGenerator) {
 	m.goal = map[state.Team]bool{}
 	m.goal[state.Team_BLUE] = false
 	m.goal[state.Team_YELLOW] = false
+	m.quit = make(chan int, 1)
 
 	return
 }

internal/app/rcon/server.go

@@ -24,6 +24,7 @@ type Server struct {
 	trustedKeys       map[string]*rsa.PublicKey
 	connectionHandler func(net.Conn)
 	listener          net.Listener
+	running           bool
 }
 
 type Client struct {
@@ -49,31 +50,38 @@ func NewServer(address string) (s *Server) {
 
 func (s *Server) Start() {
 	var err error
+	s.running = true
 	if s.Tls {
 		s.listener, err = s.createTlsListener()
 	} else {
 		s.listener, err = s.createListener()
 	}
 	if err != nil {
+		s.running = false
 		log.Printf("Failed to listen on %v: %v", s.address, err)
 		return
 	}
 	go s.listen()
 }
 
 func (s *Server) Stop() {
+	if s.listener == nil {
+		return
+	}
+	s.running = false
 	if err := s.listener.Close(); err != nil {
 		log.Printf("Could not close listener: %v", err)
 	}
 	for id := range s.clients {
 		s.CloseConnection(id)
 	}
+	s.listener = nil
 }
 
 func (s *Server) listen() {
 	log.Print("Listening on ", s.address)
 
-	for {
+	for s.running {
 		conn, err := s.listener.Accept()
 		if err != nil {
 			log.Print("Could not accept connection: ", err)