mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 02:22:26 -05:00
[feature + performance] add JSON logging format (#4355)
# Description Adds JSON logging as an optional alternative log output format. In the process this moves our log formatting itself into a separate subpkg to make it more easily modular, and improves caller name getting with some calling function name caching. ## Checklist - [x] I/we have read the [GoToSocial contribution guidelines](https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md). - [x] I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat. - [x] I/we have not leveraged AI to create the proposed changes. - [x] I/we have performed a self-review of added code. - [x] I/we have written code that is legible and maintainable by others. - [x] I/we have commented the added code, particularly in hard-to-understand areas. - [x] I/we have made any necessary changes to documentation. - [ ] I/we have added tests that cover new code. - [x] I/we have run tests and they pass locally with the changes. - [x] I/we have run `go fmt ./...` and `golangci-lint run`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4355 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
parent
96c05a90a2
commit
7af9117e0d
37 changed files with 1070 additions and 439 deletions
|
|
@ -24,6 +24,8 @@ import (
|
|||
"fmt"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
||||
"codeberg.org/gruf/go-caller"
|
||||
)
|
||||
|
||||
// Caller returns whether created errors will prepend calling function name.
|
||||
|
|
@ -48,7 +50,7 @@ func (ce *cerror) Unwrap() error {
|
|||
// newAt is the same as New() but allows specifying calldepth.
|
||||
func newAt(calldepth int, msg string) error {
|
||||
return &cerror{
|
||||
c: caller(calldepth + 1),
|
||||
c: getCaller(calldepth + 1),
|
||||
e: errors.New(msg),
|
||||
}
|
||||
}
|
||||
|
|
@ -56,37 +58,25 @@ func newAt(calldepth int, msg string) error {
|
|||
// newfAt is the same as Newf() but allows specifying calldepth.
|
||||
func newfAt(calldepth int, msgf string, args ...any) error {
|
||||
return &cerror{
|
||||
c: caller(calldepth + 1),
|
||||
c: getCaller(calldepth + 1),
|
||||
e: fmt.Errorf(msgf, args...),
|
||||
}
|
||||
}
|
||||
|
||||
// caller fetches the calling function name, skipping 'depth'.
|
||||
func caller(depth int) string {
|
||||
var pcs [1]uintptr
|
||||
// getCaller fetches the calling function name, skipping 'depth'.
|
||||
func getCaller(depth int) string {
|
||||
pcs := make([]uintptr, 1)
|
||||
|
||||
// Fetch calling function using calldepth
|
||||
_ = runtime.Callers(depth, pcs[:])
|
||||
fn := runtime.FuncForPC(pcs[0])
|
||||
// Fetch calling function at depth.
|
||||
_ = runtime.Callers(depth, pcs)
|
||||
|
||||
if fn == nil {
|
||||
return ""
|
||||
}
|
||||
// Get cached calling func name.
|
||||
name := caller.Get(pcs[0])
|
||||
|
||||
// Get func name.
|
||||
name := fn.Name()
|
||||
|
||||
// Drop everything but but function name itself
|
||||
// Drop package / everything but function name itself.
|
||||
if idx := strings.LastIndexByte(name, '.'); idx >= 0 {
|
||||
name = name[idx+1:]
|
||||
}
|
||||
|
||||
const params = `[...]`
|
||||
|
||||
// Drop any generic type parameter markers
|
||||
if idx := strings.Index(name, params); idx >= 0 {
|
||||
name = name[:idx] + name[idx+len(params):]
|
||||
}
|
||||
|
||||
return name
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue