mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-25 21:26:40 +00:00
a483bd9e38
* add delivery worker type that pulls from queue to httpclient package
* finish up some code commenting, bodge a vendored activity library change, integrate the deliverypool changes into transportcontroller
* hook up queue deletion logic
* support deleting queued http requests by target ID
* don't index APRequest by hostname in the queue
* use gorun
* use the original context's values when wrapping msg type as delivery{}
* actually log in the AP delivery worker ...
* add uncommitted changes
* use errors.AsV2()
* use errorsv2.AsV2()
* finish adding some code comments, add bad host handling to delivery workers
* slightly tweak deliveryworkerpool API, use advanced sender multiplier
* remove PopCtx() method, let others instead rely on Wait()
* shuffle things around to move delivery stuff into transport/ subpkg
* remove dead code
* formatting
* validate request before queueing for delivery
* finish adding code comments, fix up backoff code
* finish adding more code comments
* clamp minimum no. senders to 1
* add start/stop logging to delivery worker, some slight changes
* remove double logging
* use worker ptrs
* expose the embedded log fields in httpclient.Request{}
* ensure request context values are preserved when updating ctx
* add delivery worker tests
* fix linter issues
* ensure delivery worker gets inited in testrig
* fix tests to delivering messages to check worker delivery queue
* update error type to use ptr instead of value receiver
* fix test calling Workers{}.Start() instead of testrig.StartWorkers()
* update docs for advanced-sender-multiplier
* update to the latest activity library version
* add comment about not using httptest.Server{}
70 lines
1.9 KiB
Go
70 lines
1.9 KiB
Go
// GoToSocial
|
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package httpclient
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/log"
|
|
)
|
|
|
|
const (
|
|
// starting backoff duration.
|
|
baseBackoff = 2 * time.Second
|
|
)
|
|
|
|
// Request wraps an HTTP request
|
|
// to add our own retry / backoff.
|
|
type Request struct {
|
|
// Current backoff dur.
|
|
backoff time.Duration
|
|
|
|
// Delivery attempts.
|
|
attempts uint
|
|
|
|
// log fields.
|
|
log.Entry
|
|
|
|
// underlying request.
|
|
*http.Request
|
|
}
|
|
|
|
// WrapRequest wraps an existing http.Request within
|
|
// our own httpclient.Request with retry / backoff tracking.
|
|
func WrapRequest(r *http.Request) Request {
|
|
var rr Request
|
|
rr.Request = r
|
|
rr.Entry = log.WithContext(r.Context()).
|
|
WithField("method", r.Method).
|
|
WithField("url", r.URL.String()).
|
|
WithField("contentType", r.Header.Get("Content-Type"))
|
|
return rr
|
|
}
|
|
|
|
// GetBackOff returns the currently set backoff duration,
|
|
// (using a default according to no. attempts if needed).
|
|
func (r *Request) BackOff() time.Duration {
|
|
if r.backoff <= 0 {
|
|
// No backoff dur found, set our predefined
|
|
// backoff according to a multiplier of 2^n.
|
|
r.backoff = baseBackoff * 1 << (r.attempts + 1)
|
|
}
|
|
return r.backoff
|
|
}
|