mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 07:22:24 -05:00
[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>
This commit is contained in:
kim
GitHub
parent
59be7466f3
commit
098dbe6ff4
141 changed files with 3046 additions and 997 deletions
|
|
@ -24,20 +24,21 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"codeberg.org/gruf/go-kv"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||
)
|
||||
|
||||
const retries = 5
|
||||
|
||||
func (t *timeline) Get(ctx context.Context, amount int, maxID string, sinceID string, minID string, prepareNext bool) ([]Preparable, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "Get",
|
||||
"accountID": t.accountID,
|
||||
"amount": amount,
|
||||
"maxID": maxID,
|
||||
"sinceID": sinceID,
|
||||
"minID": minID,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"accountID", t.accountID},
|
||||
{"amount", amount},
|
||||
{"maxID", maxID},
|
||||
{"sinceID", sinceID},
|
||||
{"minID", minID},
|
||||
}...)
|
||||
l.Debug("entering get")
|
||||
|
||||
var items []Preparable
|
||||
|
|
@ -136,12 +137,12 @@ func (t *timeline) GetXFromTop(ctx context.Context, amount int) ([]Preparable, e
|
|||
}
|
||||
|
||||
func (t *timeline) GetXBehindID(ctx context.Context, amount int, behindID string, attempts *int) ([]Preparable, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "GetXBehindID",
|
||||
"amount": amount,
|
||||
"behindID": behindID,
|
||||
"attempts": *attempts,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"amount", amount},
|
||||
{"behindID", behindID},
|
||||
{"attempts", attempts},
|
||||
}...)
|
||||
|
||||
newAttempts := *attempts
|
||||
newAttempts++
|
||||
|
|
|
|||
|
|
@ -24,14 +24,15 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"codeberg.org/gruf/go-kv"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||
)
|
||||
|
||||
func (t *timeline) IndexBefore(ctx context.Context, itemID string, amount int) error {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "IndexBefore",
|
||||
"amount": amount,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"amount", amount},
|
||||
}...)
|
||||
|
||||
// lazily initialize index if it hasn't been done already
|
||||
if t.itemIndex.data == nil {
|
||||
|
|
@ -81,10 +82,10 @@ grabloop:
|
|||
}
|
||||
|
||||
func (t *timeline) IndexBehind(ctx context.Context, itemID string, amount int) error {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "IndexBehind",
|
||||
"amount": amount,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"amount", amount},
|
||||
}...)
|
||||
|
||||
// lazily initialize index if it hasn't been done already
|
||||
if t.itemIndex.data == nil {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import (
|
|||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"codeberg.org/gruf/go-kv"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -98,11 +99,11 @@ type manager struct {
|
|||
}
|
||||
|
||||
func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "Ingest",
|
||||
"timelineAccountID": timelineAccountID,
|
||||
"itemID": item.GetID(),
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"timelineAccountID", timelineAccountID},
|
||||
{"itemID", item.GetID()},
|
||||
}...)
|
||||
|
||||
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
|
||||
if err != nil {
|
||||
|
|
@ -114,11 +115,11 @@ func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccount
|
|||
}
|
||||
|
||||
func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "IngestAndPrepare",
|
||||
"timelineAccountID": timelineAccountID,
|
||||
"itemID": item.GetID(),
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"timelineAccountID", timelineAccountID},
|
||||
{"itemID", item.GetID()},
|
||||
}...)
|
||||
|
||||
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
|
||||
if err != nil {
|
||||
|
|
@ -130,11 +131,11 @@ func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timel
|
|||
}
|
||||
|
||||
func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID string) (int, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "Remove",
|
||||
"timelineAccountID": timelineAccountID,
|
||||
"itemID": itemID,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"timelineAccountID", timelineAccountID},
|
||||
{"itemID", itemID},
|
||||
}...)
|
||||
|
||||
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
|
||||
if err != nil {
|
||||
|
|
@ -146,10 +147,10 @@ func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID s
|
|||
}
|
||||
|
||||
func (m *manager) GetTimeline(ctx context.Context, timelineAccountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]Preparable, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "GetTimeline",
|
||||
"timelineAccountID": timelineAccountID,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"timelineAccountID", timelineAccountID},
|
||||
}...)
|
||||
|
||||
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -23,15 +23,17 @@ import (
|
|||
"context"
|
||||
"errors"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"codeberg.org/gruf/go-kv"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||
)
|
||||
|
||||
func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "Remove",
|
||||
"accountTimeline": t.accountID,
|
||||
"statusID": statusID,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"accountTimeline", t.accountID},
|
||||
{"statusID", statusID},
|
||||
}...)
|
||||
|
||||
t.Lock()
|
||||
defer t.Unlock()
|
||||
var removed int
|
||||
|
|
@ -79,11 +81,11 @@ func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
|
|||
}
|
||||
|
||||
func (t *timeline) RemoveAllBy(ctx context.Context, accountID string) (int, error) {
|
||||
l := logrus.WithFields(logrus.Fields{
|
||||
"func": "RemoveAllBy",
|
||||
"accountTimeline": t.accountID,
|
||||
"accountID": accountID,
|
||||
})
|
||||
l := log.WithFields(kv.Fields{
|
||||
|
||||
{"accountTimeline", t.accountID},
|
||||
{"accountID", accountID},
|
||||
}...)
|
||||
t.Lock()
|
||||
defer t.Unlock()
|
||||
var removed int
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue