From 4006a4d35d807b5360bc4fe5e1b21624e5d5843e Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Sun, 15 Nov 2020 15:23:49 -0500 Subject: Update logging. Expose the logger to allow others to update it. --- http/main.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'http') diff --git a/http/main.go b/http/main.go index a4ed7f6..1389ae4 100644 --- a/http/main.go +++ b/http/main.go @@ -27,6 +27,8 @@ var NewPage func(string) page.Page = func(u string) page.Page { // index is called var ReindexRedirectTo = "/fullIndex" +var Logger = log.New(os.Stderr, "", log.LstdFlags) + func GetHandler() *mux.Router { if NewPage == nil { fmt.Fprintln(os.Stderr, "Warning, global NewPage method is not defined!") @@ -45,29 +47,30 @@ func PageHandler(w http.ResponseWriter, r *http.Request) { u = "/index" } u = filepath.Join(".", u) - log.Println(u) p := NewPage(u) err := p.Render(w) if err != nil { if strings.HasSuffix(err.Error(), "no such file or directory") { - log.Printf("Page '%s' not found, trying 404", u) + Logger.Printf("%s %s %d %s", r.RemoteAddr, r.Method, 404, u) p = NewPage("404") w.WriteHeader(404) err := p.Render(w) if err != nil { - log.Println(err) + Logger.Printf("%s %s path: %s while trying 404: %s", r.RemoteAddr, r.Method, u, err) http.Error(w, "Internal server error", 500) return } return } else { - log.Println(err) + Logger.Printf("%s %s path: %s encountered: %s", r.RemoteAddr, r.Method, u, err) http.Error(w, "Internal server error", 500) return } } + Logger.Printf("%s %s %d %s", r.RemoteAddr, r.Method, 200, u) + } func RebuildIndexHandler(w http.ResponseWriter, r *http.Request) { -- cgit v1.2.3