More Go 1 updates.

signal_unix.go

@@ -5,26 +5,25 @@
 package main
 
 import (
-	"exp/signal"
 	"fmt"
 	"github.com/mkrautz/grumble/pkg/logtarget"
 	"os"
+	"os/signal"
 	"syscall"
 )
 
 func SignalHandler() {
-	for {
-		sig := <-signal.Incoming
-
-		if sig == os.UnixSignal(syscall.SIGUSR2) {
+	sigchan := make(chan os.Signal, 10)
+	signal.Notify(sigchan, syscall.SIGUSR2, syscall.SIGTERM, syscall.SIGINT)
+	for sig := range sigchan {
+		if sig == syscall.SIGUSR2 {
 			err := logtarget.Target.Rotate()
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Unable to rotate log file: %v", err)
+				fmt.Fprintf(os.Stderr, "unable to rotate log file: %v", err)
 			}
 			continue
 		}
-
-		if sig == os.UnixSignal(syscall.SIGINT) || sig == os.UnixSignal(syscall.SIGTERM) {
+		if sig == syscall.SIGINT || sig == syscall.SIGTERM {
 			os.Exit(0)
 		}
 	}