diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-07-19 09:47:55 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-19 10:47:55 +0200 |
| commit | 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 (patch) | |
| tree | 17036ad9db68c3080e1e91279c8bce9f9ea6e5c3 /internal/db/bundb/hook.go | |
| parent | [bugfix] Markdown format fixes (#718) (diff) | |
| download | gotosocial-098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3.tar.xz | |
[chore] use our own logging implementation (#716)
* first commit
Signed-off-by: kim <grufwub@gmail.com>
* replace logging with our own log library
Signed-off-by: kim <grufwub@gmail.com>
* fix imports
Signed-off-by: kim <grufwub@gmail.com>
* fix log imports
Signed-off-by: kim <grufwub@gmail.com>
* add license text
Signed-off-by: kim <grufwub@gmail.com>
* fix package import cycle between config and log package
Signed-off-by: kim <grufwub@gmail.com>
* fix empty kv.Fields{} being passed to WithFields()
Signed-off-by: kim <grufwub@gmail.com>
* fix uses of log.WithFields() with whitespace issues and empty slices
Signed-off-by: kim <grufwub@gmail.com>
* *linter related grumbling*
Signed-off-by: kim <grufwub@gmail.com>
* gofmt the codebase! also fix more log.WithFields() formatting issues
Signed-off-by: kim <grufwub@gmail.com>
* update testrig code to match new changes
Signed-off-by: kim <grufwub@gmail.com>
* fix error wrapping in non fmt.Errorf function
Signed-off-by: kim <grufwub@gmail.com>
* add benchmarking of log.Caller() vs non-cached
Signed-off-by: kim <grufwub@gmail.com>
* fix syslog tests, add standard build tags to test runner to ensure consistency
Signed-off-by: kim <grufwub@gmail.com>
* make syslog tests more robust
Signed-off-by: kim <grufwub@gmail.com>
* fix caller depth arithmatic (is that how you spell it?)
Signed-off-by: kim <grufwub@gmail.com>
* update to use unkeyed fields in kv.Field{} instances
Signed-off-by: kim <grufwub@gmail.com>
* update go-kv library
Signed-off-by: kim <grufwub@gmail.com>
* update libraries list
Signed-off-by: kim <grufwub@gmail.com>
* fuck you linter get nerfed
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/db/bundb/hook.go')
| -rw-r--r-- | internal/db/bundb/hook.go | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/internal/db/bundb/hook.go b/internal/db/bundb/hook.go index 6f9935272..23f334048 100644 --- a/internal/db/bundb/hook.go +++ b/internal/db/bundb/hook.go @@ -22,7 +22,9 @@ import ( "context" "time" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" + "codeberg.org/gruf/go-logger/v2/level" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" ) @@ -38,21 +40,17 @@ func (queryHook) AfterQuery(_ context.Context, event *bun.QueryEvent) { // Get the DB query duration dur := time.Since(event.StartTime) - log := func(lvl logrus.Level, msg string) { - logrus.WithFields(logrus.Fields{ - "duration": dur, - "operation": event.Operation(), - "query": event.Query, - }).Log(lvl, msg) - } - switch { // Warn on slow database queries case dur > time.Second: - log(logrus.WarnLevel, "SLOW DATABASE QUERY") - - // On trace, we log query information - case logrus.GetLevel() == logrus.TraceLevel: - log(logrus.TraceLevel, "database query") + log.WithFields(kv.Fields{ + {"duration", dur}, + {"query", event.Query}, + }...).Warn("SLOW DATABASE QUERY") + + // On trace, we log query information, + // manually crafting so DB query not escaped. + case log.Level() >= level.TRACE: + log.Printf("level=TRACE duration=%s query=%s", dur, event.Query) } } |