diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-09-17 19:12:12 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-17 19:12:12 +0200 |
| commit | c1585d5f8a57256a330aae4a322468aaccf9d3fa (patch) | |
| tree | f31dec55572d068f1bee8615f5ccda7454d762f9 /internal/router/logger.go | |
| parent | [bugfix] Fix emojis, attachments, and mentions not being serialized correctly... (diff) | |
| download | gotosocial-c1585d5f8a57256a330aae4a322468aaccf9d3fa.tar.xz | |
[bugfix] Fix domains not being unblockable, log internal server errors from API (#833)
* log internal server errors from 500 api calls
* don't exec into nil dest
* don't exec into nil dest
* log error in router logger not api errorhandling
* update logging a tad
* linter
Diffstat (limited to 'internal/router/logger.go')
| -rw-r--r-- | internal/router/logger.go | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/internal/router/logger.go b/internal/router/logger.go index 2e23b9cfb..6eb271a84 100644 --- a/internal/router/logger.go +++ b/internal/router/logger.go @@ -72,29 +72,21 @@ func loggingMiddleware(c *gin.Context) { fields[4] = kv.Field{"statusCode", code} fields[5] = kv.Field{"path", path} - var lvl level.LEVEL + // Create log entry with fields + l := log.WithFields(fields...) // Default is info - lvl = level.INFO + lvl := level.INFO if code >= 500 { // This is a server error lvl = level.ERROR - - if len(c.Errors) > 0 { - // Add an error string log field - fields = append(fields, kv.Field{ - "error", c.Errors.String(), - }) - } + l = l.WithField("error", c.Errors) } // Generate a nicer looking bytecount size := bytesize.Size(c.Writer.Size()) - // Create log entry with fields - l := log.WithFields(fields...) - // Finally, write log entry with status text body size l.Logf(lvl, "%s: wrote %s", http.StatusText(code), size) }() |