From 9513e91e78030411e1d7160beef6ebec75ecbb77 Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 15 Apr 2020 13:12:42 +0200 Subject: [PATCH] Cosmetic changes --- cmd/root.go | 2 +- server/http.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 6574c680a..88f523a95 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -212,7 +212,7 @@ func run(cmd *cobra.Command, args []string) { // create webserver socketHub := server.NewSocketHub() - httpd := server.NewHttpd(uri, conf.Menu, loadPoints[0], socketHub) + httpd := server.NewHTTPd(uri, conf.Menu, loadPoints[0], socketHub) var teeChan <-chan core.Param valueChan, teeChan = tee(valueChan) diff --git a/server/http.go b/server/http.go index b617b52a4..3e980810b 100644 --- a/server/http.go +++ b/server/http.go @@ -38,7 +38,7 @@ type route struct { HandlerFunc http.HandlerFunc } -// loadPoint is the well-definied minimal interface for accessing loadpoint methods +// loadPoint is the minimal interface for accessing loadpoint methods type loadPoint interface { GetMode() api.ChargeMode SetMode(api.ChargeMode) @@ -163,25 +163,25 @@ func SocketHandler(hub *SocketHub) http.HandlerFunc { } } -// NewHttpd creates HTTP server with configured routes for loadpoint -func NewHttpd(url string, links []MenuConfig, lp loadPoint, hub *SocketHub) *http.Server { +// NewHTTPd creates HTTP server with configured routes for loadpoint +func NewHTTPd(url string, links []MenuConfig, lp loadPoint, hub *SocketHub) *http.Server { var routes = []route{ - route{ + { []string{"GET"}, "/health", HealthHandler(lp), }, - route{ + { []string{"GET"}, "/config", ConfigHandler(lp), }, - route{ + { []string{"GET"}, "/mode", CurrentChargeModeHandler(lp), }, - route{ + { []string{"PUT", "POST", "OPTIONS"}, "/mode/{mode:[a-z]+}", ChargeModeHandler(lp),