From ddc4d9e53c0964952acd4ec4e2102d758d79995e Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 28 Dec 2018 15:05:31 +0100 Subject: [PATCH] Log if template is unreadable --- cmd/echoip/main.go | 6 +++++- http/http.go | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/echoip/main.go b/cmd/echoip/main.go index 0c56325..bccdeb8 100644 --- a/cmd/echoip/main.go +++ b/cmd/echoip/main.go @@ -34,8 +34,12 @@ func main() { } server := http.New(r) - server.Template = opts.Template server.IPHeaders = opts.IPHeaders + if _, err := os.Stat(opts.Template); err == nil { + server.Template = opts.Template + } else { + log.Printf("Not configuring default handler: Template not found: %s", opts.Template) + } if opts.ReverseLookup { log.Println("Enabling reverse lookup") server.LookupAddr = iputil.LookupAddr diff --git a/http/http.go b/http/http.go index 843cdaf..1635dfb 100644 --- a/http/http.go +++ b/http/http.go @@ -308,7 +308,9 @@ func (s *Server) Handler() http.Handler { } // Browser - r.Route("GET", "/", s.DefaultHandler) + if s.Template != "" { + r.Route("GET", "/", s.DefaultHandler) + } // Port testing if s.LookupPort != nil {