Merge pull request #382 from nats-io/win-signals

Differentiate signal handling for windows

server/server.go

@@ -11,11 +11,9 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"os/signal"
 	"runtime"
 	"strconv"
 	"sync"
-	"syscall"
 	"time"
 
 	// Allow dynamic profiling.
@@ -182,30 +180,6 @@ func PrintServerAndExit() {
 	os.Exit(0)
 }
 
-// Signal Handling
-func (s *Server) handleSignals() {
-	if s.opts.NoSigs {
-		return
-	}
-	c := make(chan os.Signal, 1)
-
-	signal.Notify(c, syscall.SIGINT, syscall.SIGUSR1)
-
-	go func() {
-		for sig := range c {
-			Debugf("Trapped %q signal", sig)
-			switch sig {
-			case syscall.SIGINT:
-				Noticef("Server Exiting..")
-				os.Exit(0)
-			case syscall.SIGUSR1:
-				// File log re-open for rotating file logs.
-				s.ReOpenLogFile()
-			}
-		}
-	}()
-}
-
 // Protected check on running state
 func (s *Server) isRunning() bool {
 	s.mu.Lock()

server/signal.go

@@ -0,0 +1,34 @@
+// +build !windows
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
+
+package server
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+// Signal Handling
+func (s *Server) handleSignals() {
+	if s.opts.NoSigs {
+		return
+	}
+	c := make(chan os.Signal, 1)
+
+	signal.Notify(c, syscall.SIGINT, syscall.SIGUSR1)
+
+	go func() {
+		for sig := range c {
+			Debugf("Trapped %q signal", sig)
+			switch sig {
+			case syscall.SIGINT:
+				Noticef("Server Exiting..")
+				os.Exit(0)
+			case syscall.SIGUSR1:
+				// File log re-open for rotating file logs.
+				s.ReOpenLogFile()
+			}
+		}
+	}()
+}

server/signal_windows.go

@@ -0,0 +1,26 @@
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
+
+package server
+
+import (
+	"os"
+	"os/signal"
+)
+
+// Signal Handling
+func (s *Server) handleSignals() {
+	if s.opts.NoSigs {
+		return
+	}
+	c := make(chan os.Signal, 1)
+
+	signal.Notify(c, os.Interrupt)
+
+	go func() {
+		for sig := range c {
+			Debugf("Trapped %q signal", sig)
+			Noticef("Server Exiting..")
+			os.Exit(0)
+		}
+	}()
+}