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/text/plain.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/text/plain.go')
| -rw-r--r-- | internal/text/plain.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/text/plain.go b/internal/text/plain.go index 3549200c6..bcdb0c0f4 100644 --- a/internal/text/plain.go +++ b/internal/text/plain.go @@ -60,7 +60,7 @@ func (f *formatter) FromPlain(ctx context.Context, pmf gtsmodel.ParseMentionFunc var htmlContentBytes bytes.Buffer err := md.Convert([]byte(plain), &htmlContentBytes) if err != nil { - log.Errorf("error formatting plaintext to HTML: %s", err) + log.Errorf(ctx, "error formatting plaintext to HTML: %s", err) } result.HTML = htmlContentBytes.String() @@ -68,7 +68,10 @@ func (f *formatter) FromPlain(ctx context.Context, pmf gtsmodel.ParseMentionFunc result.HTML = SanitizeHTML(result.HTML) // shrink ray - result.HTML = minifyHTML(result.HTML) + result.HTML, err = m.String("text/html", result.HTML) + if err != nil { + log.Errorf(ctx, "error minifying HTML: %s", err) + } return result } |