diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-08-10 15:18:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 15:18:37 +0100 |
| commit | 52eeeb16279497e24ed6b1e34a7a16fc69b587d1 (patch) | |
| tree | cfcf9c482afe230ae251bd1d472cb59d9cc9e906 /federationsender | |
| parent | 4b09f445c992fd0a389efc34d75aaa7e5bd50e9c (diff) | |
Prefix-defined Kafka topics (#1254)
* Prefix-defined Kafka topics
* Fix current state server test
Diffstat (limited to 'federationsender')
| -rw-r--r-- | federationsender/consumers/eduserver.go | 8 | ||||
| -rw-r--r-- | federationsender/consumers/keychange.go | 2 | ||||
| -rw-r--r-- | federationsender/consumers/roomserver.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/federationsender/consumers/eduserver.go b/federationsender/consumers/eduserver.go index 74ce65db..e1a42f07 100644 --- a/federationsender/consumers/eduserver.go +++ b/federationsender/consumers/eduserver.go @@ -50,20 +50,20 @@ func NewOutputEDUConsumer( ) *OutputEDUConsumer { c := &OutputEDUConsumer{ typingConsumer: &internal.ContinualConsumer{ - Topic: string(cfg.Matrix.Kafka.Topics.OutputTypingEvent), + Topic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputTypingEvent)), Consumer: kafkaConsumer, PartitionStore: store, }, sendToDeviceConsumer: &internal.ContinualConsumer{ - Topic: string(cfg.Matrix.Kafka.Topics.OutputSendToDeviceEvent), + Topic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputSendToDeviceEvent)), Consumer: kafkaConsumer, PartitionStore: store, }, queues: queues, db: store, ServerName: cfg.Matrix.ServerName, - TypingTopic: string(cfg.Matrix.Kafka.Topics.OutputTypingEvent), - SendToDeviceTopic: string(cfg.Matrix.Kafka.Topics.OutputSendToDeviceEvent), + TypingTopic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputTypingEvent)), + SendToDeviceTopic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputSendToDeviceEvent)), } c.typingConsumer.ProcessMessage = c.onTypingEvent c.sendToDeviceConsumer.ProcessMessage = c.onSendToDeviceEvent diff --git a/federationsender/consumers/keychange.go b/federationsender/consumers/keychange.go index 8060125e..c1136f10 100644 --- a/federationsender/consumers/keychange.go +++ b/federationsender/consumers/keychange.go @@ -49,7 +49,7 @@ func NewKeyChangeConsumer( ) *KeyChangeConsumer { c := &KeyChangeConsumer{ consumer: &internal.ContinualConsumer{ - Topic: string(cfg.Matrix.Kafka.Topics.OutputKeyChangeEvent), + Topic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputKeyChangeEvent)), Consumer: kafkaConsumer, PartitionStore: store, }, diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go index b3a4cde3..e09350f8 100644 --- a/federationsender/consumers/roomserver.go +++ b/federationsender/consumers/roomserver.go @@ -49,7 +49,7 @@ func NewOutputRoomEventConsumer( rsAPI api.RoomserverInternalAPI, ) *OutputRoomEventConsumer { consumer := internal.ContinualConsumer{ - Topic: string(cfg.Matrix.Kafka.Topics.OutputRoomEvent), + Topic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputRoomEvent)), Consumer: kafkaConsumer, PartitionStore: store, } |