From 888cbbb0f17e97e8378972998bbdac581329bbde Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Mon, 2 Apr 2018 20:23:39 +0200 Subject: [PATCH] removed / default handler --- webserver/handler.go | 4 ---- webserver/webserver.go | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/webserver/handler.go b/webserver/handler.go index 20419bb..2e62b69 100644 --- a/webserver/handler.go +++ b/webserver/handler.go @@ -9,10 +9,6 @@ import ( "github.com/gorilla/mux" ) -func IndexHdlr(w http.ResponseWriter, req *http.Request) { - http.ServeFile(w, req, "html/index.html") -} - func (web *WebServer) webSocketHdlr(w http.ResponseWriter, req *http.Request) { conn, err := upgrader.Upgrade(w, req, nil) diff --git a/webserver/webserver.go b/webserver/webserver.go index f5c9ce3..d72cd8f 100644 --- a/webserver/webserver.go +++ b/webserver/webserver.go @@ -84,10 +84,7 @@ func (web *WebServer) Start() { web.trx.SetNotifyServerChangeCb(web.updateWsClients) - box, err := rice.FindBox("../html") - if err != nil { - log.Fatal("webserver: box not found") - } + box := rice.MustFindBox("../html") fileServer := http.FileServer(box.HTTPBox()) @@ -100,7 +97,6 @@ func (web *WebServer) Start() { router.HandleFunc("/api/server/{server}/active", web.serverActiveHdlr) router.HandleFunc("/api/server/{server}/state", web.serverStateHdlr) router.HandleFunc("/ws", web.webSocketHdlr) - router.HandleFunc("/", IndexHdlr) router.PathPrefix("/").Handler(fileServer) serverURL := fmt.Sprintf("%s:%d", web.url, web.port)