From 9af8a02f054181e0cf8d5114f3ecdc9814cc2835 Mon Sep 17 00:00:00 2001 From: Michael Engelhardt Date: Sat, 21 Nov 2020 21:38:45 +0100 Subject: [PATCH] Rename function to PrependWithContextRoot --- config/web.go | 6 +++--- main.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/web.go b/config/web.go index 59a9926d..892b2a76 100644 --- a/config/web.go +++ b/config/web.go @@ -60,9 +60,9 @@ func (web *webConfig) SocketAddress() string { return fmt.Sprintf("%s:%d", web.Address, web.Port) } -// AppendToContexRoot appends the given string to the context root -// AppendToContexRoot takes care of having only one "/" character at +// PrependWithContextRoot appends the given string to the context root +// PrependWithContextRoot takes care of having only one "/" character at // the join point and exactly on "/" at the end -func (web *webConfig) AppendToContexRoot(fragment string) string { +func (web *webConfig) PrependWithContextRoot(fragment string) string { return web.ContextRoot + strings.Trim(fragment, "/") + "/" } diff --git a/main.go b/main.go index 259a09f0..5f2e57d5 100644 --- a/main.go +++ b/main.go @@ -31,12 +31,12 @@ func main() { } // favicon needs to be always served from the root http.HandleFunc("/favicon.ico", favIconHandler) - http.HandleFunc(cfg.Web.AppendToContexRoot("/api/v1/results"), resultsHandler) - http.HandleFunc(cfg.Web.AppendToContexRoot("/health"), healthHandler) + http.HandleFunc(cfg.Web.PrependWithContextRoot("/api/v1/results"), resultsHandler) + http.HandleFunc(cfg.Web.PrependWithContextRoot("/health"), healthHandler) http.Handle(cfg.Web.ContextRoot, GzipHandler(http.StripPrefix(cfg.Web.ContextRoot, http.FileServer(http.Dir("./static"))))) if cfg.Metrics { - http.Handle(cfg.Web.AppendToContexRoot("/metrics"), promhttp.Handler()) + http.Handle(cfg.Web.PrependWithContextRoot("/metrics"), promhttp.Handler()) } log.Printf("[main][main] Listening on %s%s\n", cfg.Web.SocketAddress(), cfg.Web.ContextRoot) go watchdog.Monitor(cfg)