moved http routes out of the server main()

botserv/main.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"bitbucket.org/hackerbots/server"
-	"golang.org/x/net/websocket"
 )
 
 var addr = flag.String("addr", ":8666", "http service address")
@@ -47,21 +46,9 @@ func main() {
 		log.Fatal(err)
 	}
 
-	sm := http.NewServeMux()
-
 	c := server.NewController(conf, *mprofile, *profile)
-	go c.Run()
 
-	sm.Handle("/", server.JsonHandler(c.Index))
-	sm.Handle("/ws/", websocket.Handler(c.AddPlayer))
-	sm.Handle("/game/start/", server.JsonHandler(c.StartGame))
-	sm.Handle("/game/list/", server.JsonHandler(c.ListGames))
-	sm.Handle("/game/stats/", server.JsonHandler(c.GameStats))
-	sm.Handle("/game/bw/", server.JsonHandler(c.BW))
-	sm.Handle("/game/stop/", server.JsonHandler(c.StopGame))
-	sm.HandleFunc("/fuck/shit/up/", c.KillServer)
-
-	err = http.ListenAndServe(*addr, sm)
+	err = http.ListenAndServe(*addr, c)
 	if err != nil {
 		log.Fatal("unable to start server")
 	}