diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2023-02-17 12:02:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-17 12:02:29 +0100 |
| commit | 68e6d08c768b789987a753d42f66caf73ce10ee1 (patch) | |
| tree | 1c9eb6da6c326266d653de80684c3aec58922638 /internal/api/client/streaming/stream.go | |
| parent | [bugfix] Set 'discoverable' properly on API accounts (#1511) (diff) | |
| download | gotosocial-68e6d08c768b789987a753d42f66caf73ce10ee1.tar.xz | |
[feature] Add a request ID and include it in logs (#1476)
This adds a lightweight form of tracing to GTS. Each incoming request is
assigned a Request ID which we then pass on and log in all our log
lines. Any function that gets called downstream from an HTTP handler
should now emit a requestID=value pair whenever it logs something.
Co-authored-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/api/client/streaming/stream.go')
| -rw-r--r-- | internal/api/client/streaming/stream.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/api/client/streaming/stream.go b/internal/api/client/streaming/stream.go index 99d8b23e1..a03f36d16 100644 --- a/internal/api/client/streaming/stream.go +++ b/internal/api/client/streaming/stream.go @@ -166,11 +166,12 @@ func (m *Module) StreamGETHandler(c *gin.Context) { return } - l := log.WithFields(kv.Fields{ - {"account", account.Username}, - {"streamID", stream.ID}, - {"streamType", streamType}, - }...) + l := log.WithContext(c.Request.Context()). + WithFields(kv.Fields{ + {"account", account.Username}, + {"streamID", stream.ID}, + {"streamType", streamType}, + }...) // Upgrade the incoming HTTP request, which hijacks the underlying // connection and reuses it for the websocket (non-http) protocol. |