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/timeline/prepare.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/timeline/prepare.go')
| -rw-r--r-- | internal/timeline/prepare.go | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/internal/timeline/prepare.go b/internal/timeline/prepare.go index dae9031e5..c643d1873 100644 --- a/internal/timeline/prepare.go +++ b/internal/timeline/prepare.go @@ -24,18 +24,19 @@ import ( "errors" "fmt" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/log" ) func (t *timeline) prepareNextQuery(ctx context.Context, amount int, maxID string, sinceID string, minID string) error { - l := logrus.WithFields(logrus.Fields{ - "func": "prepareNextQuery", - "amount": amount, - "maxID": maxID, - "sinceID": sinceID, - "minID": minID, - }) + l := log.WithFields(kv.Fields{ + + {"amount", amount}, + {"maxID", maxID}, + {"sinceID", sinceID}, + {"minID", minID}, + }...) var err error @@ -169,10 +170,10 @@ prepareloop: } func (t *timeline) PrepareFromTop(ctx context.Context, amount int) error { - l := logrus.WithFields(logrus.Fields{ - "func": "PrepareFromTop", - "amount": amount, - }) + l := log.WithFields(kv.Fields{ + + {"amount", amount}, + }...) // lazily initialize prepared posts if it hasn't been done already if t.preparedItems.data == nil { |