LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

simplify logging

Browse source
This commit is contained in:
Alex Grintsvayg 2018-09-27 14:08:45 -04:00
parent 874481205f
commit c99c2194fe
No known key found for this signature in database
GPG key ID: AEB3F089F86A22B5
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
api/server.go
View file

@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"reflect" "reflect"
"strconv"
"strings" "strings"
"github.com/lbryio/lbry.go/errors" "github.com/lbryio/lbry.go/errors"
@ -18,11 +17,8 @@ import (
// ResponseHeaders are returned with each response // ResponseHeaders are returned with each response
var ResponseHeaders map[string]string var ResponseHeaders map[string]string
// LogError Allows specific error logging for the server at specific points. // Log allows logging of events and errors
var LogError = func(*http.Request, *Response, error) {} var Log = func(*http.Request, *Response, error) {}
// LogInfo Allows for specific logging information.
var LogInfo = func(*http.Request, *Response) {}
// TraceEnabled Attaches a trace field to the JSON response when enabled. // TraceEnabled Attaches a trace field to the JSON response when enabled.
var TraceEnabled = false var TraceEnabled = false
@ -92,12 +88,10 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
success := rsp.Status < http.StatusBadRequest success := rsp.Status < http.StatusBadRequest
consoleText := r.RemoteAddr + " [" + strconv.Itoa(rsp.Status) + "]: " + r.Method + " " + r.URL.Path
if success { if success {
LogInfo(r, &rsp) Log(r, &rsp, nil)
} else { } else {
LogError(r, &rsp, errors.Prefix(consoleText, rsp.Error)) Log(r, &rsp, rsp.Error)
} }
// redirect // redirect
@ -105,7 +99,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, rsp.RedirectURL, rsp.Status) http.Redirect(w, r, rsp.RedirectURL, rsp.Status)
return return
} else if rsp.RedirectURL != "" { } else if rsp.RedirectURL != "" {
LogError(r, &rsp, errors.Base( Log(r, &rsp, errors.Base(
"status code %d does not indicate a redirect, but RedirectURL is non-empty '%s'", "status code %d does not indicate a redirect, but RedirectURL is non-empty '%s'",
rsp.Status, rsp.RedirectURL, rsp.Status, rsp.RedirectURL,
)) ))
@ -140,7 +134,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
Trace: trace, Trace: trace,
}, "", " ") }, "", " ")
if err != nil { if err != nil {
LogError(r, &rsp, errors.Prefix("Error encoding JSON response: ", err)) Log(r, &rsp, errors.Prefix("Error encoding JSON response: ", err))
} }
w.WriteHeader(rsp.Status) w.WriteHeader(rsp.Status)