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 /eduserver | |
| 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 'eduserver')
| -rw-r--r-- | eduserver/eduserver.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eduserver/eduserver.go b/eduserver/eduserver.go index 2e6ba0c8..e0e61b1a 100644 --- a/eduserver/eduserver.go +++ b/eduserver/eduserver.go @@ -39,12 +39,13 @@ func NewInternalAPI( eduCache *cache.EDUCache, userAPI userapi.UserInternalAPI, ) api.EDUServerInputAPI { + cfg := &base.Cfg.EDUServer return &input.EDUServerInputAPI{ Cache: eduCache, UserAPI: userAPI, Producer: base.KafkaProducer, - OutputTypingEventTopic: string(base.Cfg.Kafka.Topics.OutputTypingEvent), - OutputSendToDeviceEventTopic: string(base.Cfg.Kafka.Topics.OutputSendToDeviceEvent), - ServerName: base.Cfg.Matrix.ServerName, + OutputTypingEventTopic: string(cfg.Matrix.Kafka.Topics.OutputTypingEvent), + OutputSendToDeviceEventTopic: string(cfg.Matrix.Kafka.Topics.OutputSendToDeviceEvent), + ServerName: cfg.Matrix.ServerName, } } |