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

Use gomatrixserverlib.Client instead of http.Client (#2421)

Browse source 
* Update to matrix-org/gomatrixserverlib#303

* Use `gomatrixserverlib.Client` for phone-home stats

* Use `gomatrixserverlib.Client` for push notifications

* Use `gomatrixserverlib.Client` for appservices

* Use `gomatrixserverlib.Client` for three-PID invites
This commit is contained in:
Neil Alexander 2022-05-05 11:33:16 +01:00 • committed by GitHub
parent 1bfe87aa56
commit d9e71b93b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 35 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
userapi/util/phonehomestats.go
View file

@ -39,7 +39,7 @@ type phoneHomeStats struct {
cfg *config.Dendrite
db storage.Statistics
isMonolith bool
client *http.Client
client *gomatrixserverlib.Client
}
type timestampToRUUsage struct {
@ -55,10 +55,9 @@ func StartPhoneHomeCollector(startTime time.Time, cfg *config.Dendrite, statsDB
cfg: cfg,
db: statsDB,
isMonolith: cfg.IsMonolith,
client: &http.Client{
Timeout: time.Second * 30,
Transport: http.DefaultTransport,
},
client: gomatrixserverlib.NewClient(
gomatrixserverlib.WithTimeout(time.Second * 30),
),
}
// start initial run after 5min
@ -152,8 +151,7 @@ func (p *phoneHomeStats) collect() {
}
request.Header.Set("User-Agent", "Dendrite/"+internal.VersionString())
_, err = p.client.Do(request)
if err != nil {
if _, err = p.client.DoHTTPRequest(ctx, request); err != nil {
logrus.WithError(err).Error("unable to send anonymous stats")
return
}