Add shutdown handler

Author: the-maldridge

main.go

@@ -3,7 +3,9 @@ package main
 import (
 	"log"
 	"os"
+	"os/signal"
 	"strings"
+	"syscall"
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/netauth/netauth/pkg/netauth"
@@ -60,8 +62,21 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := srvr.Serve(); err != nil {
-		appLogger.Error("Error serving", "error", err)
-		os.Exit(1)
+	go func() {
+		if err := srvr.Serve(); err != nil {
+			appLogger.Error("Error serving", "error", err)
+			os.Exit(1)
+		}
+	}()
+
+	// Sit here and wait for a signal to shutdown.
+	ch := make(chan os.Signal, 5)
+	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
+	<-ch
+	appLogger.Info("Shutting down...")
+	if err := srvr.Shutdown(); err != nil {
+		appLogger.Error("Error during shutdown", "error", err)
+		os.Exit(2)
 	}
+	appLogger.Info("Goodbye!")
 }

radius/server.go

@@ -1,6 +1,7 @@
 package radius
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/go-hclog"
@@ -43,7 +44,13 @@ func (s *Server) Serve() error {
 		Handler:      radius.HandlerFunc(s.handler),
 		SecretSource: radius.StaticSecretSource([]byte("secret")),
 	}
+	s.radsrv = server
 
 	s.log.Info("Serving Radius on :1812")
 	return server.ListenAndServe()
 }
+
+// Shutdown requests the underlying packetserver to shutdown smoothly.
+func (s *Server) Shutdown() error {
+	return s.radsrv.Shutdown(context.Background())
+}

radius/type.go

@@ -4,12 +4,15 @@ import (
 	"context"
 
 	"github.com/hashicorp/go-hclog"
+	"layeh.com/radius"
 )
 
 // Server owns the radius server itself and its handlers.
 type Server struct {
 	log hclog.Logger
 	n   netauth
+
+	radsrv radius.PacketServer
 }
 
 // Option enables passing of various options to the server on startup.