diff --git a/go.mod b/go.mod index db370e4..77dc8f4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/corpix/uarand v0.0.0-20170723150923-031be390f409 // indirect github.com/dgraph-io/badger/v4 v4.2.0 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect diff --git a/go.sum b/go.sum index 45ac4e4..b70e4af 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkz github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= diff --git a/helpers.go b/helpers.go index 31293cd..92f7a28 100644 --- a/helpers.go +++ b/helpers.go @@ -5,9 +5,11 @@ import ( "io" "net/http" "regexp" + "strconv" "strings" "time" + "github.com/dustin/go-humanize" "github.com/rs/zerolog/log" "golang.org/x/time/rate" ) @@ -81,7 +83,11 @@ func DoRequestNoRead(req *http.Request) (*http.Response, error) { return nil, err } - log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", resp.Header.Get("Content-Length")). + contentLength, err := strconv.ParseUint(resp.Header.Get("Content-Length"), 10, 64) + if err != nil { + contentLength = 0 + } + log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", Bytes(contentLength)). Str("duration", duration.String()).Msg("Response") return resp, nil @@ -112,12 +118,12 @@ func DoRequest(req *http.Request) (*http.Response, []byte, error) { body, err := io.ReadAll(resp.Body) if err != nil { - log.Err(err).Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Int("content-length", len(body)). + log.Err(err).Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", Bytes(uint64(len(body)))). Str("duration", duration.String()).Msg("Response (Unable to Read Body)") return nil, nil, err } - log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Int("content-length", len(body)). + log.Debug().Int("code", resp.StatusCode).Str("content-type", resp.Header.Get("Content-Type")).Str("content-length", Bytes(uint64(len(body)))). Str("duration", duration.String()).Msg("Response") return resp, body, nil } @@ -169,3 +175,8 @@ func NormalizeTitle(title string) string { "-", ) } + +// Bytes calls humanize.Bytes and removes space characters +func Bytes(bytes uint64) string { + return strings.Replace(humanize.Bytes(bytes), " ", "", -1) +}