mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 02:22:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Fix domains not being unblockable, log internal server errors from API (#833)

Browse source 
* 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
This commit is contained in:
tobi 2022-09-17 19:12:12 +02:00 • committed by GitHub
commit c1585d5f8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/router/logger.go
View file

@ -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)
}()