mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 11:23:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix errcheck lint errors

Browse source
This commit is contained in:
Kegan Dougal 2020-02-13 15:19:26 +00:00
parent 232ea948ab
commit c5e7d8f206
5 changed files with 50 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roomserver/input/events.go
View file

@ -196,7 +196,12 @@ func processInviteEvent(
return err
}
succeeded := false
defer common.EndTransaction(updater, &succeeded)
defer func() {
txerr := common.EndTransaction(updater, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
if updater.IsJoin() {
// If the user is joined to the room then that takes precedence over this

7
roomserver/input/latest_events.go
View file

@ -60,7 +60,12 @@ func updateLatestEvents(
return
}
succeeded := false
defer common.EndTransaction(updater, &succeeded)
defer func() {
txerr := common.EndTransaction(updater, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
u := latestEventsUpdater{
ctx: ctx, db: db, updater: updater, ow: ow, roomNID: roomNID,

6
roomserver/storage/sqlite3/storage.go
View file

@ -254,7 +254,7 @@ func (d *Database) Events(
var eventJSONs []eventJSONPair
var err error
results := make([]types.Event, len(eventNIDs))
common.WithTransaction(d.db, func(txn *sql.Tx) error {
err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
eventJSONs, err = d.statements.bulkSelectEventJSON(ctx, txn, eventNIDs)
if err != nil || len(eventJSONs) == 0 {
return nil
@ -318,7 +318,7 @@ func (d *Database) SetState(
func (d *Database) StateAtEventIDs(
ctx context.Context, eventIDs []string,
) (se []types.StateAtEvent, err error) {
common.WithTransaction(d.db, func(txn *sql.Tx) error {
err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
se, err = d.statements.bulkSelectStateAtEventByID(ctx, txn, eventIDs)
return err
})
@ -805,7 +805,7 @@ func (d *Database) GetMembership(
func (d *Database) GetMembershipEventNIDsForRoom(
ctx context.Context, roomNID types.RoomNID, joinOnly bool,
) (eventNIDs []types.EventNID, err error) {
common.WithTransaction(d.db, func(txn *sql.Tx) error {
err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
if joinOnly {
eventNIDs, err = d.statements.selectMembershipsFromRoomAndMembership(
ctx, txn, roomNID, membershipStateJoin,

16
syncapi/storage/postgres/syncserver.go
View file

@ -413,13 +413,18 @@ func (d *SyncServerDatasource) addPDUDeltaToResponse(
numRecentEventsPerRoom int,
wantFullState bool,
res *types.Response,
) ([]string, error) {
) (joinedRoomIDs []string, err error) {
txn, err := d.db.BeginTx(ctx, &txReadOnlySnapshot)
if err != nil {
return nil, err
}
var succeeded bool
defer common.EndTransaction(txn, &succeeded)
defer func() {
txerr := common.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
stateFilter := gomatrixserverlib.DefaultStateFilter() // TODO: use filter provided in request
@ -570,7 +575,12 @@ func (d *SyncServerDatasource) getResponseWithPDUsForCompleteSync(
return
}
var succeeded bool
defer common.EndTransaction(txn, &succeeded)
defer func() {
txerr := common.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
// Get the current sync position which we will base the sync response on.
toPos, err = d.syncPositionTx(ctx, txn)

28
syncapi/storage/sqlite3/syncserver.go
View file

@ -444,13 +444,18 @@ func (d *SyncServerDatasource) addPDUDeltaToResponse(
numRecentEventsPerRoom int,
wantFullState bool,
res *types.Response,
) ([]string, error) {
) (joinedRoomIDs []string, err error) {
txn, err := d.db.BeginTx(ctx, &txReadOnlySnapshot)
if err != nil {
return nil, err
}
var succeeded bool
defer common.EndTransaction(txn, &succeeded)
defer func() {
txerr := common.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
stateFilterPart := gomatrixserverlib.DefaultStateFilter() // TODO: use filter provided in request
@ -601,7 +606,12 @@ func (d *SyncServerDatasource) getResponseWithPDUsForCompleteSync(
return
}
var succeeded bool
defer common.EndTransaction(txn, &succeeded)
defer func() {
txerr := common.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
// Get the current sync position which we will base the sync response on.
toPos, err = d.syncPositionTx(ctx, txn)
@ -734,14 +744,20 @@ func (d *SyncServerDatasource) GetAccountDataInRange(
// Returns an error if there was an issue with the upsert
func (d *SyncServerDatasource) UpsertAccountData(
ctx context.Context, userID, roomID, dataType string,
) (types.StreamPosition, error) {
) (sp types.StreamPosition, err error) {
txn, err := d.db.BeginTx(ctx, nil)
if err != nil {
return types.StreamPosition(0), err
}
var succeeded bool
defer common.EndTransaction(txn, &succeeded)
return d.accountData.insertAccountData(ctx, txn, userID, roomID, dataType)
defer func() {
txerr := common.EndTransaction(txn, &succeeded)
if err == nil && txerr != nil {
err = txerr
}
}()
sp, err = d.accountData.insertAccountData(ctx, txn, userID, roomID, dataType)
return
}
// AddInviteEvent stores a new invite event for a user.