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

Return error instead of Fatal log

Browse source
This commit is contained in:
Till Faelligen 2022-07-18 14:10:06 +02:00
parent 6a3dd9e890
commit 1cb3cbbb6d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import (
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas" "github.com/matrix-org/dendrite/syncapi/storage/postgres/deltas"
"github.com/matrix-org/dendrite/syncapi/storage/shared" "github.com/matrix-org/dendrite/syncapi/storage/shared"
"github.com/sirupsen/logrus"
) )
// SyncServerDatasource represents a sync server datasource which manages // SyncServerDatasource represents a sync server datasource which manages
@ -44,10 +43,10 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions)
return nil, err return nil, err
} }
if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { 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 { if _, err = d.db.Exec(currentRoomStateSchema); err != nil {
logrus.Fatalf("unable to create table: %s", err) return nil, err
} }
accountData, err := NewPostgresAccountDataTable(d.db) accountData, err := NewPostgresAccountDataTable(d.db)
if err != nil { if err != nil {

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

@ -23,7 +23,6 @@ import (
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/syncapi/storage/shared" "github.com/matrix-org/dendrite/syncapi/storage/shared"
"github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas" "github.com/matrix-org/dendrite/syncapi/storage/sqlite3/deltas"
"github.com/sirupsen/logrus"
) )
// SyncServerDatasource represents a sync server datasource which manages // SyncServerDatasource represents a sync server datasource which manages
@ -54,10 +53,10 @@ func (d *SyncServerDatasource) prepare(dbProperties *config.DatabaseOptions) (er
return err return err
} }
if _, err = d.db.Exec(outputRoomEventsSchema); err != nil { 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 { 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) accountData, err := NewSqliteAccountDataTable(d.db, &d.streamID)
if err != nil { if err != nil {