don't rename package without need.

This commit is contained in:
Stephen McQuay 2014-04-23 14:54:39 -07:00
parent 72d0843ff8
commit fd53d3e51e

View File

@ -10,7 +10,7 @@ import (
"runtime/pprof" "runtime/pprof"
"time" "time"
hbserver "bitbucket.org/hackerbots/server" "bitbucket.org/hackerbots/server"
"code.google.com/p/go.net/websocket" "code.google.com/p/go.net/websocket"
) )
@ -42,23 +42,23 @@ func main() {
log.Println("serving profile info at http://localhost:8667/debug/pprof/") log.Println("serving profile info at http://localhost:8667/debug/pprof/")
} }
conf, err := hbserver.LoadConfig(*config) conf, err := server.LoadConfig(*config)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
sm := http.NewServeMux() sm := http.NewServeMux()
c := hbserver.NewController(conf, *mprofile, *profile) c := server.NewController(conf, *mprofile, *profile)
go c.Run() go c.Run()
sm.Handle("/", hbserver.JsonHandler(c.Index)) sm.Handle("/", server.JsonHandler(c.Index))
sm.Handle("/ws/", websocket.Handler(c.AddPlayer)) sm.Handle("/ws/", websocket.Handler(c.AddPlayer))
sm.Handle("/game/start/", hbserver.JsonHandler(c.StartGame)) sm.Handle("/game/start/", server.JsonHandler(c.StartGame))
sm.Handle("/game/list/", hbserver.JsonHandler(c.ListGames)) sm.Handle("/game/list/", server.JsonHandler(c.ListGames))
sm.Handle("/game/stats/", hbserver.JsonHandler(c.GameStats)) sm.Handle("/game/stats/", server.JsonHandler(c.GameStats))
sm.Handle("/game/bw/", hbserver.JsonHandler(c.BW)) sm.Handle("/game/bw/", server.JsonHandler(c.BW))
sm.Handle("/game/stop/", hbserver.JsonHandler(c.StopGame)) sm.Handle("/game/stop/", server.JsonHandler(c.StopGame))
sm.HandleFunc("/fuck/shit/up/", c.KillServer) sm.HandleFunc("/fuck/shit/up/", c.KillServer)
err = http.ListenAndServe(*addr, sm) err = http.ListenAndServe(*addr, sm)