diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-08-10 14:18:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 14:18:04 +0100 |
| commit | 4b09f445c992fd0a389efc34d75aaa7e5bd50e9c (patch) | |
| tree | 18d6168718ac06e569eb271f25ed4dc064010b50 /roomserver/roomserver.go | |
| parent | fdabba1851c489d801ea4029bce9dec7d415b2df (diff) | |
Configuration format v1 (#1230)
* Initial pass at refactoring config (not finished)
* Don't forget current state and EDU servers
* More shifting around
* Update server key API tests
* Fix roomserver test
* Fix more tests
* Further tweaks
* Fix current state server test (sort of)
* Maybe fix appservices
* Fix client API test
* Include database connection string in database options
* Fix sync API build
* Update config test
* Fix unit tests
* Fix federation sender build
* Fix gobind build
* Set Listen address for all services in HTTP monolith mode
* Validate config, reinstate appservice derived in directory, tweaks
* Tweak federation API test
* Set MaxOpenConnections/MaxIdleConnections to previous values
* Update generate-config
Diffstat (limited to 'roomserver/roomserver.go')
| -rw-r--r-- | roomserver/roomserver.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index 427d5ff3..1c226085 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -39,18 +39,20 @@ func NewInternalAPI( keyRing gomatrixserverlib.JSONVerifier, fedClient *gomatrixserverlib.FederationClient, ) api.RoomserverInternalAPI { - roomserverDB, err := storage.Open(string(base.Cfg.Database.RoomServer), base.Cfg.DbProperties()) + cfg := &base.Cfg.RoomServer + + roomserverDB, err := storage.Open(&cfg.Database) if err != nil { logrus.WithError(err).Panicf("failed to connect to room server db") } return &internal.RoomserverInternalAPI{ DB: roomserverDB, - Cfg: base.Cfg, + Cfg: cfg, Producer: base.KafkaProducer, - OutputRoomEventTopic: string(base.Cfg.Kafka.Topics.OutputRoomEvent), + OutputRoomEventTopic: string(cfg.Matrix.Kafka.Topics.OutputRoomEvent), Cache: base.Caches, - ServerName: base.Cfg.Matrix.ServerName, + ServerName: cfg.Matrix.ServerName, FedClient: fedClient, KeyRing: keyRing, } |