hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-31 21:32:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back out matrix-org/dendrite#2421 by restoring http.Clients

Browse source 
This creates problems with non-HTTPS endpoints and should fix #2444.
This commit is contained in:
Neil Alexander 2022-05-10 11:08:10 +01:00
parent 1b3fa9689c
commit 77722c5a4f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
6 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
appservice/workers/transaction_scheduler.go
View file

@ -42,7 +42,7 @@ var (
// size), then send that off to the AS's /transactions/{txnID} endpoint. It also
// handles exponentially backing off in case the AS isn't currently available.
func SetupTransactionWorkers(
client *gomatrixserverlib.Client,
client *http.Client,
appserviceDB storage.Database,
workerStates []types.ApplicationServiceWorkerState,
) error {
@ -58,7 +58,7 @@ func SetupTransactionWorkers(
// worker is a goroutine that sends any queued events to the application service
// it is given.
func worker(client *gomatrixserverlib.Client, db storage.Database, ws types.ApplicationServiceWorkerState) {
func worker(client *http.Client, db storage.Database, ws types.ApplicationServiceWorkerState) {
log.WithFields(log.Fields{
"appservice": ws.AppService.ID,
}).Info("Starting application service")
@ -200,7 +200,7 @@ func createTransaction(
// send sends events to an application service. Returns an error if an OK was not
// received back from the application service or the request timed out.
func send(
client *gomatrixserverlib.Client,
client *http.Client,
appservice config.ApplicationService,
txnID int,
transaction []byte,
@ -213,7 +213,7 @@ func send(
return err
}
req.Header.Set("Content-Type", "application/json")
resp, err := client.DoHTTPRequest(context.TODO(), req)
resp, err := client.Do(req)
if err != nil {
return err
}