diff options
| author | 2023-02-17 12:02:29 +0100 | |
|---|---|---|
| committer | 2023-02-17 12:02:29 +0100 | |
| commit | 68e6d08c768b789987a753d42f66caf73ce10ee1 (patch) | |
| tree | 1c9eb6da6c326266d653de80684c3aec58922638 /internal/visibility | |
| 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/visibility')
| -rw-r--r-- | internal/visibility/statusboostable.go | 8 | ||||
| -rw-r--r-- | internal/visibility/statushometimelineable.go | 3 | ||||
| -rw-r--r-- | internal/visibility/statuspublictimelineable.go | 3 | ||||
| -rw-r--r-- | internal/visibility/statusvisible.go | 3 | 
4 files changed, 10 insertions, 7 deletions
| diff --git a/internal/visibility/statusboostable.go b/internal/visibility/statusboostable.go index c463ee372..ec6839d42 100644 --- a/internal/visibility/statusboostable.go +++ b/internal/visibility/statusboostable.go @@ -39,23 +39,23 @@ func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Sta  	// direct messages are never boostable, even if they're visible  	if targetStatus.Visibility == gtsmodel.VisibilityDirect { -		log.Trace("status is not boostable because it is a DM") +		log.Trace(ctx, "status is not boostable because it is a DM")  		return false, nil  	}  	// the original account should always be able to boost its own non-DM statuses  	if requestingAccount.ID == targetStatus.Account.ID { -		log.Trace("status is boostable because author is booster") +		log.Trace(ctx, "status is boostable because author is booster")  		return true, nil  	}  	// if status is followers-only and not the author's, it is not boostable  	if targetStatus.Visibility == gtsmodel.VisibilityFollowersOnly { -		log.Trace("status not boostable because it is followers-only") +		log.Trace(ctx, "status not boostable because it is followers-only")  		return false, nil  	}  	// otherwise, status is as boostable as it says it is -	log.Trace("defaulting to status.boostable value") +	log.Trace(ctx, "defaulting to status.boostable value")  	return *targetStatus.Boostable, nil  } diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go index 19a39aa51..b2fbecd85 100644 --- a/internal/visibility/statushometimelineable.go +++ b/internal/visibility/statushometimelineable.go @@ -30,7 +30,8 @@ import (  )  func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { -	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...) +	l := log.WithContext(ctx). +		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)  	// don't timeline statuses more than 5 min in the future  	maxID, err := id.NewULIDFromTime(time.Now().Add(5 * time.Minute)) diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go index 113249fe1..05a94bf8e 100644 --- a/internal/visibility/statuspublictimelineable.go +++ b/internal/visibility/statuspublictimelineable.go @@ -30,7 +30,8 @@ import (  )  func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { -	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...) +	l := log.WithContext(ctx). +		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)  	// don't timeline statuses more than 5 min in the future  	maxID, err := id.NewULIDFromTime(time.Now().Add(5 * time.Minute)) diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go index 002db1119..2f89727ee 100644 --- a/internal/visibility/statusvisible.go +++ b/internal/visibility/statusvisible.go @@ -29,7 +29,8 @@ import (  )  func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) { -	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...) +	l := log.WithContext(ctx). +		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)  	// Fetch any relevant accounts for the target status  	const getBoosted = true | 
