From 1cb3cbbb6ddd6c64d8ce2a5278e1d3bc543d37fc Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 18 Jul 2022 14:10:06 +0200 Subject: [PATCH] Return error instead of Fatal log --- syncapi/storage/postgres/syncserver.go | 5 ++--- syncapi/storage/sqlite3/syncserver.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index 6f925a512..c6121e419 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -25,7 +25,6 @@ import ( "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" "github.com/matrix-org/dendrite/syncapi/storage/shared" - "github.com/sirupsen/logrus" ) // SyncServerDatasource represents a sync server datasource which manages @@ -44,10 +43,10 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions) return nil, err } if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { - logrus.Fatalf("unable to create table: %s", err) + return nil, err } if _, err = d.db.Exec(currentRoomStateSchema); err != nil { - logrus.Fatalf("unable to create table: %s", err) + return nil, err } accountData, err := NewPostgresAccountDataTable(d.db) if err != nil { diff --git a/syncapi/storage/sqlite3/syncserver.go b/syncapi/storage/sqlite3/syncserver.go index cc6bbf815..39ceec81d 100644 --- a/syncapi/storage/sqlite3/syncserver.go +++ b/syncapi/storage/sqlite3/syncserver.go @@ -23,7 +23,6 @@ import ( "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/syncapi/storage/shared" "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" - "github.com/sirupsen/logrus" ) // SyncServerDatasource represents a sync server datasource which manages @@ -54,10 +53,10 @@ func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (er return err } if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { - logrus.Fatalf("unable to create table: %s", err) + return err } if _, err = d.db.Exec(currentRoomStateSchema); err != nil { - logrus.Fatalf("unable to create table: %s", err) + return err } accountData, err := NewSqliteAccountDataTable(d.db, &d.streamID) if err != nil {