mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 22:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint errors

Browse source
This commit is contained in:
Neil Alexander 2022-05-03 12:51:22 +01:00
parent 7abaada35e
commit 7a805e16d5
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/create-account/main.go
View file

@ -108,6 +108,9 @@ func main() {
0, // TODO 0, // TODO
cfg.Global.ServerNotices.LocalPart, cfg.Global.ServerNotices.LocalPart,
) )
if err != nil {
logrus.WithError(err).Fatalln("Failed to connect to the database")
}
accType := api.AccountTypeUser accType := api.AccountTypeUser
if *isAdmin { if *isAdmin {

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

@ -39,7 +39,7 @@ type Database struct {
func Open(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) { func Open(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) {
var d Database var d Database
var err error var err error
db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewDummyWriter()) db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewExclusiveWriter())
if err != nil { if err != nil {
return nil, fmt.Errorf("sqlutil.Open: %w", err) return nil, fmt.Errorf("sqlutil.Open: %w", err)
} }
@ -176,7 +176,7 @@ func (d *Database) prepare(db *sql.DB, writer sqlutil.Writer, cache caching.Room
d.Database = shared.Database{ d.Database = shared.Database{
DB: db, DB: db,
Cache: cache, Cache: cache,
Writer: sqlutil.NewExclusiveWriter(), Writer: writer,
EventsTable: events, EventsTable: events,
EventTypesTable: eventTypes, EventTypesTable: eventTypes,
EventStateKeysTable: eventStateKeys, EventStateKeysTable: eventStateKeys,