diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2021-08-29 15:41:41 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-08-29 16:41:41 +0200 |
| commit | ed462245730bd7832019bd43e0bc1c9d1c055e8e (patch) | |
| tree | 1caad78ea6aabf5ea93c93a8ade97176b4889500 /internal/db/bundb/instance.go | |
| parent | Mention fixup (#167) (diff) | |
| download | gotosocial-ed462245730bd7832019bd43e0bc1c9d1c055e8e.tar.xz | |
Add SQLite support, fix un-thread-safe DB caches, small performance f… (#172)
* Add SQLite support, fix un-thread-safe DB caches, small performance fixes
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add SQLite licenses to README
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* appease the linter, and fix my dumbass-ery
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* make requested changes
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
* add back comment
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/instance.go')
| -rw-r--r-- | internal/db/bundb/instance.go | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go index 2813e7e1d..4e26fc7c4 100644 --- a/internal/db/bundb/instance.go +++ b/internal/db/bundb/instance.go @@ -21,7 +21,6 @@ package bundb import ( "context" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -30,8 +29,7 @@ import ( type instanceDB struct { config *config.Config - conn *bun.DB - log *logrus.Logger + conn *DBConn } func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int, db.Error) { @@ -49,8 +47,10 @@ func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int } count, err := q.Count(ctx) - - return count, processErrorResponse(err) + if err != nil { + return 0, i.conn.ProcessError(err) + } + return count, nil } func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) (int, db.Error) { @@ -68,8 +68,10 @@ func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) ( } count, err := q.Count(ctx) - - return count, processErrorResponse(err) + if err != nil { + return 0, i.conn.ProcessError(err) + } + return count, nil } func (i *instanceDB) CountInstanceDomains(ctx context.Context, domain string) (int, db.Error) { @@ -89,12 +91,14 @@ func (i *instanceDB) CountInstanceDomains(ctx context.Context, domain string) (i } count, err := q.Count(ctx) - - return count, processErrorResponse(err) + if err != nil { + return 0, i.conn.ProcessError(err) + } + return count, nil } func (i *instanceDB) GetInstanceAccounts(ctx context.Context, domain string, maxID string, limit int) ([]*gtsmodel.Account, db.Error) { - i.log.Debug("GetAccountsForInstance") + i.conn.log.Debug("GetAccountsForInstance") accounts := []*gtsmodel.Account{} @@ -111,7 +115,9 @@ func (i *instanceDB) GetInstanceAccounts(ctx context.Context, domain string, max q = q.Limit(limit) } - err := processErrorResponse(q.Scan(ctx)) - - return accounts, err + err := q.Scan(ctx) + if err != nil { + return nil, i.conn.ProcessError(err) + } + return accounts, nil } |