Merge pull request #51 from olabiniV2/optional_webport

Add a configuration parameter making it possible to avoid the web port

cmd/grumble/server.go

@@ -1358,6 +1358,12 @@ func (server *Server) Port() int {
 	return port
 }
 
+// ListenWebPort returns true if we should listen to the
+// web port, otherwise false
+func (server *Server) ListenWebPort() bool {
+	return !server.cfg.BoolValue("NoWebServer")
+}
+
 // WebPort returns the port the web server will listen on when it is
 // started.
 func (server *Server) WebPort() int {
@@ -1399,6 +1405,7 @@ func (server *Server) Start() (err error) {
 	host := server.HostAddress()
 	port := server.Port()
 	webport := server.WebPort()
+	shouldListenWeb := server.ListenWebPort()
 
 	// Setup our UDP listener
 	server.udpconn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.ParseIP(host), Port: port})
@@ -1437,6 +1444,7 @@ func (server *Server) Start() (err error) {
 	}
 	server.tlsl = tls.NewListener(server.tcpl, server.tlscfg)
 
+	if shouldListenWeb {
 		// Create HTTP server and WebSocket "listener"
 		webaddr := &net.TCPAddr{IP: net.ParseIP(host), Port: webport}
 		server.webtlscfg = &tls.Config{
@@ -1468,6 +1476,10 @@ func (server *Server) Start() (err error) {
 		}()
 
 		server.Printf("Started: listening on %v and %v", server.tcpl.Addr(), server.webwsl.Addr())
+	} else {
+		server.Printf("Started: listening on %v", server.tcpl.Addr())
+	}
+
 	server.running = true
 
 	// Open a fresh freezer log
@@ -1490,10 +1502,17 @@ func (server *Server) Start() (err error) {
 	// for the servers. Each network goroutine defers a call to
 	// netwg.Done(). In the Stop() we close all the connections
 	// and call netwg.Wait() to wait for the goroutines to end.
-	server.netwg.Add(3)
+	numWG := 2
+	if shouldListenWeb {
+		numWG++
+	}
+
+	server.netwg.Add(numWG)
 	go server.udpListenLoop()
 	go server.acceptLoop(server.tlsl)
+	if shouldListenWeb {
 		go server.acceptLoop(server.webwsl)
+	}
 
 	// Schedule a server registration update (if needed)
 	go func() {
@@ -1523,6 +1542,7 @@ func (server *Server) Stop() (err error) {
 	// This does not apply to opened WebSockets, which were forcibly closed when
 	// all clients were disconnected.
 	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(15*time.Second))
+	if server.ListenWebPort() {
 		err = server.webhttp.Shutdown(ctx)
 		cancel()
 		if err == context.DeadlineExceeded {
@@ -1531,12 +1551,14 @@ func (server *Server) Stop() (err error) {
 			return err
 		}
 
-	// Close the listeners
+		err = server.webwsl.Close()
-	err = server.tlsl.Close()
 		if err != nil {
 			return err
 		}
-	err = server.webwsl.Close()
+	}
+
+	// Close the listeners
+	err = server.tlsl.Close()
 	if err != nil {
 		return err
 	}