mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-18 00:27:29 -06:00
reference global logrus (#274)
* reference logrus' global logger instead of passing and storing a logger reference everywhere * always directly use global logrus logger instead of referencing an instance * test suites should also directly use the global logrus logger * rename gin logging function to clarify that it's middleware * correct comments which erroneously referenced removed logger parameter * setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible
This commit is contained in:
parent
367bdca250
commit
083099a957
210 changed files with 506 additions and 662 deletions
|
|
@ -25,7 +25,6 @@ import (
|
|||
|
||||
"github.com/go-fed/activity/pub"
|
||||
"github.com/go-fed/activity/streams/vocab"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
|
||||
|
|
@ -47,20 +46,18 @@ type federatingDB struct {
|
|||
pool sync.Pool
|
||||
db db.DB
|
||||
config *config.Config
|
||||
log *logrus.Logger
|
||||
typeConverter typeutils.TypeConverter
|
||||
}
|
||||
|
||||
// New returns a DB interface using the given database, config, and logger.
|
||||
func New(db db.DB, config *config.Config, log *logrus.Logger) DB {
|
||||
// New returns a DB interface using the given database and config
|
||||
func New(db db.DB, config *config.Config) DB {
|
||||
fdb := federatingDB{
|
||||
mutex: sync.Mutex{},
|
||||
locks: make(map[string]*mutex, 100),
|
||||
pool: sync.Pool{New: func() interface{} { return &mutex{} }},
|
||||
db: db,
|
||||
config: config,
|
||||
log: log,
|
||||
typeConverter: typeutils.NewConverter(config, db, log),
|
||||
typeConverter: typeutils.NewConverter(config, db),
|
||||
}
|
||||
go fdb.cleanupLocks()
|
||||
return &fdb
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue