mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-07 14:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use OS level proxy, update logging

Browse source
This commit is contained in:
Till Faelligen 2022-05-04 13:03:19 +02:00
parent b524a05a4f
commit 8e5036221f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
userapi/util/phonehomestats.go
View file

@ -56,7 +56,8 @@ func StartPhoneHomeCollector(startTime time.Time, cfg *config.Dendrite, statsDB
db: statsDB, db: statsDB,
isMonolith: cfg.IsMonolith, isMonolith: cfg.IsMonolith,
client: &http.Client{ client: &http.Client{
Timeout: time.Second * 30, Timeout: time.Second * 30,
Transport: http.DefaultTransport,
}, },
} }
@ -90,7 +91,7 @@ func (p *phoneHomeStats) collect() {
// cpu and memory usage information // cpu and memory usage information
err := getMemoryStats(p) err := getMemoryStats(p)
if err != nil { if err != nil {
logrus.WithError(err).Error("unable to get memory/cpu stats, using defaults") logrus.WithError(err).Warn("unable to get memory/cpu stats, using defaults")
} }
// configuration information // configuration information
@ -118,7 +119,7 @@ func (p *phoneHomeStats) collect() {
// user stats and DB engine // user stats and DB engine
userStats, db, err := p.db.UserStatistics(ctx) userStats, db, err := p.db.UserStatistics(ctx)
if err != nil { if err != nil {
logrus.WithError(err).Error("unable to query userstats, using default values") logrus.WithError(err).Warn("unable to query userstats, using default values")
} }
p.stats["database_engine"] = db.Engine p.stats["database_engine"] = db.Engine
p.stats["database_server_version"] = db.Version p.stats["database_server_version"] = db.Version
@ -138,22 +139,22 @@ func (p *phoneHomeStats) collect() {
output := bytes.Buffer{} output := bytes.Buffer{}
if err = json.NewEncoder(&output).Encode(p.stats); err != nil { if err = json.NewEncoder(&output).Encode(p.stats); err != nil {
logrus.WithError(err).Error("unable to encode stats") logrus.WithError(err).Error("unable to encode anonymous stats")
return return
} }
logrus.Infof("Reporting stats to %s: %s", p.cfg.Global.ReportStats.Endpoint, output.String()) logrus.Infof("Reporting stats to %s: %s", p.cfg.Global.ReportStats.Endpoint, output.String())
request, err := http.NewRequest(http.MethodPost, p.cfg.Global.ReportStats.Endpoint, &output) request, err := http.NewRequestWithContext(ctx, http.MethodPost, p.cfg.Global.ReportStats.Endpoint, &output)
if err != nil { if err != nil {
logrus.WithError(err).Error("unable to create phone home stats request") logrus.WithError(err).Error("unable to create anonymous stats request")
return return
} }
request.Header.Set("User-Agent", "Dendrite/"+internal.VersionString()) request.Header.Set("User-Agent", "Dendrite/"+internal.VersionString())
_, err = p.client.Do(request) _, err = p.client.Do(request)
if err != nil { if err != nil {
logrus.WithError(err).Warn("unable to send phone home stats") logrus.WithError(err).Error("unable to send anonymous stats")
return return
} }
} }