summaryrefslogtreecommitdiff
path: root/internal/timeline/remove.go
diff options
context:
space:
mode:
authorLibravatar Daenney <daenney@users.noreply.github.com>2023-02-17 12:02:29 +0100
committerLibravatar GitHub <noreply@github.com>2023-02-17 12:02:29 +0100
commit68e6d08c768b789987a753d42f66caf73ce10ee1 (patch)
tree1c9eb6da6c326266d653de80684c3aec58922638 /internal/timeline/remove.go
parent[bugfix] Set 'discoverable' properly on API accounts (#1511) (diff)
downloadgotosocial-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/timeline/remove.go')
-rw-r--r--internal/timeline/remove.go18
1 files changed, 10 insertions, 8 deletions
diff --git a/internal/timeline/remove.go b/internal/timeline/remove.go
index f0bd4618b..1693ed03a 100644
--- a/internal/timeline/remove.go
+++ b/internal/timeline/remove.go
@@ -28,10 +28,11 @@ import (
)
func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
- l := log.WithFields(kv.Fields{
- {"accountTimeline", t.accountID},
- {"statusID", statusID},
- }...)
+ l := log.WithContext(ctx).
+ WithFields(kv.Fields{
+ {"accountTimeline", t.accountID},
+ {"statusID", statusID},
+ }...)
t.Lock()
defer t.Unlock()
@@ -80,10 +81,11 @@ func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
}
func (t *timeline) RemoveAllBy(ctx context.Context, accountID string) (int, error) {
- l := log.WithFields(kv.Fields{
- {"accountTimeline", t.accountID},
- {"accountID", accountID},
- }...)
+ l := log.WithContext(ctx).
+ WithFields(kv.Fields{
+ {"accountTimeline", t.accountID},
+ {"accountID", accountID},
+ }...)
t.Lock()
defer t.Unlock()