diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-10-04 15:24:19 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-04 15:24:19 +0200 |
| commit | e04b187702acb0c9908237a35b3a9857e2167b3f (patch) | |
| tree | 29839b8d5bbc28d34aba759a48dd7b005f1444f5 /internal/db | |
| parent | Follow request auto approval (#259) (diff) | |
| download | gotosocial-e04b187702acb0c9908237a35b3a9857e2167b3f.tar.xz | |
Refactor/tidy (#261)
* tidy up streaming
* cut down code duplication
* test get followers/following
* test streaming processor
* fix some test models
* add TimeMustParse
* fix uri / url typo
* make trace logging less verbose
* make logging more consistent
* disable quote on logging
* remove context.Background
* remove many extraneous mastodon references
* regenerate swagger
* don't log query on no rows result
* log latency first for easier reading
Diffstat (limited to 'internal/db')
| -rw-r--r-- | internal/db/bundb/trace.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/internal/db/bundb/trace.go b/internal/db/bundb/trace.go index e62e8c01f..82b50c058 100644 --- a/internal/db/bundb/trace.go +++ b/internal/db/bundb/trace.go @@ -20,6 +20,7 @@ package bundb import ( "context" + "database/sql" "time" "github.com/sirupsen/logrus" @@ -46,8 +47,17 @@ func (q *debugQueryHook) BeforeQuery(ctx context.Context, event *bun.QueryEvent) func (q *debugQueryHook) AfterQuery(ctx context.Context, event *bun.QueryEvent) { dur := time.Since(event.StartTime).Round(time.Microsecond) l := q.log.WithFields(logrus.Fields{ - "queryTime": dur, + "duration": dur, "operation": event.Operation(), }) - l.Trace(event.Query) + + if event.Err != nil && event.Err != sql.ErrNoRows { + // if there's an error the it'll be handled in the application logic, + // but we can still debug log it here alongside the query + l = l.WithField("query", event.Query) + l.Debug(event.Err) + return + } + + l.Tracef("[%s] %s", dur, event.Operation()) } |