Shutdown on Ctrl+C

.travis.yml

@@ -1,5 +1,6 @@
 language: go
 go:
+- 1.13.x
 - 1.12.x
 addons:
   apt:

main.go

@@ -17,6 +17,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
 
 	"github.com/nats-io/nats-server/v2/server"
 )
@@ -109,4 +110,5 @@ func main() {
 	if err := server.Run(s); err != nil {
 		server.PrintAndDie(err.Error())
 	}
+	runtime.Goexit()
 }

server/server.go

@@ -1168,7 +1168,7 @@ func (s *Server) Shutdown() {
 		s.mu.Unlock()
 		return
 	}
-	s.Noticef("Server Exiting..")
+	s.Noticef("Initiating Shutdown...")
 
 	opts := s.getOpts()
 
@@ -1271,6 +1271,7 @@ func (s *Server) Shutdown() {
 		s.deletePortsFile(opts.PortsFileDir)
 	}
 
+	s.Noticef("Server Exiting..")
 	// Close logger if applicable. It allows tests on Windows
 	// to be able to do proper cleanup (delete log file).
 	s.logging.RLock()

server/service_windows.go

@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/debug"
 )
 
 const (
@@ -110,15 +109,15 @@ func Run(server *Server) error {
 		server.Start()
 		return nil
 	}
-	run := svc.Run
 	isInteractive, err := svc.IsAnInteractiveSession()
 	if err != nil {
 		return err
 	}
 	if isInteractive {
-		run = debug.Run
+		server.Start()
+		return nil
 	}
-	return run(serviceName, &winServiceWrapper{server})
+	return svc.Run(serviceName, &winServiceWrapper{server})
 }
 
 // isWindowsService indicates if NATS is running as a Windows service.

server/signal.go

@@ -49,7 +49,7 @@ func (s *Server) handleSignals() {
 				s.Debugf("Trapped %q signal", sig)
 				switch sig {
 				case syscall.SIGINT:
-					s.Noticef("Server Exiting..")
+					s.Shutdown()
 					os.Exit(0)
 				case syscall.SIGUSR1:
 					// File log re-open for rotating file logs.

server/signal_windows.go

@@ -35,7 +35,7 @@ func (s *Server) handleSignals() {
 	go func() {
 		for sig := range c {
 			s.Debugf("Trapped %q signal", sig)
-			s.Noticef("Server Exiting..")
+			s.Shutdown()
 			os.Exit(0)
 		}
 	}()

test/configs/authorization.conf

@@ -5,7 +5,7 @@ authorization {
   include "auths.conf"
 
   # Just foo for testing
-  PASS: $2a$10$UHR6GhotWhpLsKtVP0/i6.Nh9.fuY73cWjLoJjb2sKT8KISBcUW5q
+  PASS: $2a$04$P/.bd.7unw9Ew7yWJqXsl.f4oNRLQGvadEL2YnqQXbbb.IVQajRdK
 
   # Users listed with permissions.
   users = [

vendor/modules.txt

@@ -16,7 +16,6 @@ golang.org/x/crypto/ed25519/internal/edwards25519
 # golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e
 golang.org/x/sys/windows/svc/eventlog
 golang.org/x/sys/windows/svc
-golang.org/x/sys/windows/svc/debug
 golang.org/x/sys/windows/svc/mgr
 golang.org/x/sys/windows
 golang.org/x/sys/windows/registry