mirror/syncthing
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2026-05-19 06:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmd/stcrashreceiver: Propagate synthetic user ID for crashes

Browse Source
This commit is contained in:
Jakob Borg
2023-09-20 08:39:01 +02:00
parent 483ecada80
commit d4c2acf6f6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/stcrashreceiver/sentry.go
View File

@@ -40,6 +40,7 @@ type sentryService struct {
type sentryRequest struct {
reportID string
userID string
data []byte
}
@@ -52,7 +53,7 @@ func (s *sentryService) Serve(ctx context.Context) {
log.Println("Failed to parse crash report:", err)
continue
}
if err := sendReport(s.dsn, pkt, req.reportID); err != nil {
if err := sendReport(s.dsn, pkt, req.userID); err != nil {
log.Println("Failed to send crash report:", err)
}
@@ -62,9 +63,9 @@ func (s *sentryService) Serve(ctx context.Context) {
}
}
func (s *sentryService) Send(reportID string, data []byte) bool {
func (s *sentryService) Send(reportID, userID string, data []byte) bool {
select {
case s.inbox <- sentryRequest{reportID, data}:
case s.inbox <- sentryRequest{reportID, userID, data}:
return true
default:
return false

2
cmd/stcrashreceiver/stcrashreceiver.go
View File

@@ -87,7 +87,7 @@ func (r *crashReceiver) servePut(reportID string, w http.ResponseWriter, req *ht
}
// Send the report to Sentry
if !r.sentry.Send(reportID, bs) {
if !r.sentry.Send(reportID, userIDFor(req), bs) {
log.Println("Failed to send report to sentry (queue full):", reportID)
}
}