Remove signals completely. That's not Go 1.

os_posix.go

@@ -4,29 +4,14 @@ package main
 import (
 	"flag"
 	"os"
-	"os/signal"
 	"os/exec"
 	"path/filepath"
-	"net"
-	"net/rpc"
-	"runtime"
 )
 
 func CreateSockFlag(name, desc string) *string {
 	return flag.String(name, "unix", desc)
 }
 
-func IsTerminationSignal(sig os.Signal) bool {
-	usig, ok := sig.(os.UnixSignal)
-	if !ok {
-		return false
-	}
-	if usig == os.SIGINT || usig == os.SIGTERM {
-		return true
-	}
-	return false
-}
-
 // Full path of the current executable
 func GetExecutableFileName() string {
 	// try readlink first
@@ -50,26 +35,3 @@ func GetExecutableFileName() string {
 	}
 	return ""
 }
-
-func (s *Server) Loop() {
-	conn_in := make(chan net.Conn)
-	go acceptConnections(conn_in, s.listener)
-	for {
-		// handle connections or server CMDs (currently one CMD)
-		select {
-		case c := <-conn_in:
-			rpc.ServeConn(c)
-			runtime.GC()
-		case cmd := <-s.cmd_in:
-			switch cmd {
-			case SERVER_CLOSE:
-				return
-			}
-		case sig := <-signal.Incoming:
-			if IsTerminationSignal(sig) {
-				return
-			}
-		}
-	}
-}
-

os_windows.go

@@ -31,22 +31,3 @@ func GetExecutableFileName() string {
 	}
 	return string(utf16.Decode(b[:ret]))
 }
-
-func (s *Server) Loop() {
-	conn_in := make(chan net.Conn)
-	go acceptConnections(conn_in, s.listener)
-	for {
-		// handle connections or server CMDs (currently one CMD)
-		select {
-		case c := <-conn_in:
-			rpc.ServeConn(c)
-			runtime.GC()
-		case cmd := <-s.cmd_in:
-			switch cmd {
-			case SERVER_CLOSE:
-				return
-			}
-		}
-	}
-}
-

server.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"runtime"
 	"sync"
+	"net/rpc"
 )
 
 //-------------------------------------------------------------------------
@@ -139,6 +140,24 @@ func acceptConnections(in chan net.Conn, listener net.Listener) {
 	}
 }
 
+func (s *Server) Loop() {
+	conn_in := make(chan net.Conn)
+	go acceptConnections(conn_in, s.listener)
+	for {
+		// handle connections or server CMDs (currently one CMD)
+		select {
+		case c := <-conn_in:
+			rpc.ServeConn(c)
+			runtime.GC()
+		case cmd := <-s.cmd_in:
+			switch cmd {
+			case SERVER_CLOSE:
+				return
+			}
+		}
+	}
+}
+
 func (s *Server) Close() {
 	s.cmd_in <- SERVER_CLOSE
 }