diff --git a/internal/httpclient/request.go b/internal/httpclient/request.go index dfe51b160..853563945 100644 --- a/internal/httpclient/request.go +++ b/internal/httpclient/request.go @@ -19,6 +19,7 @@ import ( "net/http" + "strconv" "time" "github.com/superseriousbusiness/gotosocial/internal/log" @@ -32,6 +33,7 @@ // Request wraps an HTTP request // to add our own retry / backoff. type Request struct { + // Current backoff dur. backoff time.Duration @@ -57,8 +59,7 @@ func WrapRequest(r *http.Request) *Request { // Only add content-type header if a request body exists. entry = entry.WithField("contentType", r.Header.Get("Content-Type")) } - // note our formatting library follows ptr values - entry = entry.WithField("attempt", &rr.attempts) + entry = entry.WithField("attempt", uintPtr{&rr.attempts}) rr.Entry = entry return rr } @@ -73,3 +74,12 @@ func (r *Request) BackOff() time.Duration { } return r.backoff } + +type uintPtr struct{ u *uint } + +func (f uintPtr) String() string { + if f.u == nil { + return "" + } + return strconv.FormatUint(uint64(*f.u), 10) +}