From 7a805e16d56af8aff59b54084249a26697fe31e5 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 3 May 2022 12:51:22 +0100 Subject: [PATCH] Fix lint errors --- cmd/create-account/main.go | 3 +++ roomserver/storage/sqlite3/storage.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/create-account/main.go b/cmd/create-account/main.go index 379e47f0e..7a5660522 100644 --- a/cmd/create-account/main.go +++ b/cmd/create-account/main.go @@ -108,6 +108,9 @@ func main() { 0, // TODO cfg.Global.ServerNotices.LocalPart, ) + if err != nil { + logrus.WithError(err).Fatalln("Failed to connect to the database") + } accType := api.AccountTypeUser if *isAdmin { diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index 81753c868..e6cf1a53f 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -39,7 +39,7 @@ type Database struct { func Open(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches) (*Database, error) { var d Database var err error - db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewDummyWriter()) + db, writer, err := base.DatabaseConnection(dbProperties, sqlutil.NewExclusiveWriter()) if err != nil { 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{ DB: db, Cache: cache, - Writer: sqlutil.NewExclusiveWriter(), + Writer: writer, EventsTable: events, EventTypesTable: eventTypes, EventStateKeysTable: eventStateKeys,