From da513899356606deb7158c56400f99f6fbc5e4b7 Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Mon, 9 Mar 2015 13:16:31 +0100
Subject: [PATCH] Wire websocket forwarder with players updater.

---
 cmd/mtwebmapper/main.go    | 15 ++++++++-------
 cmd/mtwebmapper/players.go |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmd/mtwebmapper/main.go b/cmd/mtwebmapper/main.go
index 86370f6..bad51f5 100644
--- a/cmd/mtwebmapper/main.go
+++ b/cmd/mtwebmapper/main.go
@@ -65,20 +65,21 @@ func main() {
 	router.Path("/map/{z:[0-9]+}/{x:[0-9]+}/{y:[0-9]+}.png").Handler(subBaseLine)
 
 	var btu baseTilesUpdates
-
-	if playersFIFO != "" {
-		plys := newPlayers(playersFIFO)
-		go plys.run()
-		router.Path("/players").Methods("GET").Handler(plys)
-	}
+	var wsf *websocketForwarder
 
 	if websockets {
-		wsf := newWebsocketForwarder()
+		wsf = newWebsocketForwarder()
 		go wsf.run()
 		router.Path("/ws").Methods("GET").Handler(wsf)
 		btu = wsf
 	}
 
+	if playersFIFO != "" {
+		plys := newPlayers(playersFIFO, wsf)
+		go plys.run()
+		router.Path("/players").Methods("GET").Handler(plys)
+	}
+
 	if redisHost != "" {
 		var colors *common.Colors
 		var err error
diff --git a/cmd/mtwebmapper/players.go b/cmd/mtwebmapper/players.go
index 726453f..f58d637 100644
--- a/cmd/mtwebmapper/players.go
+++ b/cmd/mtwebmapper/players.go
@@ -4,10 +4,11 @@ import "net/http"
 
 type players struct {
 	fifo string
+	wsf  *websocketForwarder
 }
 
-func newPlayers(fifo string) *players {
-	return &players{fifo: fifo}
+func newPlayers(fifo string, wsf *websocketForwarder) *players {
+	return &players{fifo: fifo, wsf: wsf}
 }
 
 func (ps *players) run() {