sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Remove unneeded TopicFor

Browse source
This commit is contained in:
Till Faelligen 2021-07-24 12:17:42 +02:00
parent a833f5764a
commit f5a4e4a339
15 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appservice/consumers/roomserver.go
View file

@ -53,7 +53,7 @@ func NewOutputRoomEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "appservice/roomserver", ComponentName: "appservice/roomserver",
Topic: cfg.Global.JetStream.TopicFor(jetstream.OutputRoomEvent), Topic: jetstream.OutputRoomEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: appserviceDB, PartitionStore: appserviceDB,
} }

2
clientapi/clientapi.go
View file

@ -53,7 +53,7 @@ func AddPublicRoutes(
syncProducer := &producers.SyncAPIProducer{ syncProducer := &producers.SyncAPIProducer{
Producer: producer, Producer: producer,
Topic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputClientData), Topic: jetstream.OutputClientData,
} }
routing.Setup( routing.Setup(

6
eduserver/eduserver.go
View file

@ -48,9 +48,9 @@ func NewInternalAPI(
Cache: eduCache, Cache: eduCache,
UserAPI: userAPI, UserAPI: userAPI,
Producer: producer, Producer: producer,
OutputTypingEventTopic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputTypingEvent), OutputTypingEventTopic: jetstream.OutputTypingEvent,
OutputSendToDeviceEventTopic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputSendToDeviceEvent), OutputSendToDeviceEventTopic: jetstream.OutputSendToDeviceEvent,
OutputReceiptEventTopic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputReceiptEvent), OutputReceiptEventTopic: jetstream.OutputReceiptEvent,
ServerName: cfg.Matrix.ServerName, ServerName: cfg.Matrix.ServerName,
} }
} }

10
federationsender/consumers/eduserver.go
View file

@ -56,29 +56,29 @@ func NewOutputEDUConsumer(
typingConsumer: &internal.ContinualConsumer{ typingConsumer: &internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "eduserver/typing", ComponentName: "eduserver/typing",
Topic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputTypingEvent), Topic: jetstream.OutputTypingEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
}, },
sendToDeviceConsumer: &internal.ContinualConsumer{ sendToDeviceConsumer: &internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "eduserver/sendtodevice", ComponentName: "eduserver/sendtodevice",
Topic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputSendToDeviceEvent), Topic: jetstream.OutputSendToDeviceEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
}, },
receiptConsumer: &internal.ContinualConsumer{ receiptConsumer: &internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "eduserver/receipt", ComponentName: "eduserver/receipt",
Topic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputReceiptEvent), Topic: jetstream.OutputReceiptEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
}, },
queues: queues, queues: queues,
db: store, db: store,
ServerName: cfg.Matrix.ServerName, ServerName: cfg.Matrix.ServerName,
TypingTopic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputTypingEvent), TypingTopic: jetstream.OutputTypingEvent,
SendToDeviceTopic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputSendToDeviceEvent), SendToDeviceTopic: jetstream.OutputSendToDeviceEvent,
} }
c.typingConsumer.ProcessMessage = c.onTypingEvent c.typingConsumer.ProcessMessage = c.onTypingEvent
c.sendToDeviceConsumer.ProcessMessage = c.onSendToDeviceEvent c.sendToDeviceConsumer.ProcessMessage = c.onSendToDeviceEvent

2
federationsender/consumers/keychange.go
View file

@ -54,7 +54,7 @@ func NewKeyChangeConsumer(
consumer: &internal.ContinualConsumer{ consumer: &internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "federationsender/keychange", ComponentName: "federationsender/keychange",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputKeyChangeEvent)), Topic: jetstream.OutputKeyChangeEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
}, },

2
federationsender/consumers/roomserver.go
View file

@ -53,7 +53,7 @@ func NewOutputRoomEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "federationsender/roomserver", ComponentName: "federationsender/roomserver",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputRoomEvent)), Topic: jetstream.OutputRoomEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
keyserver/keyserver.go
View file

@ -45,7 +45,7 @@ func NewInternalAPI(
logrus.WithError(err).Panicf("failed to connect to key server database") logrus.WithError(err).Panicf("failed to connect to key server database")
} }
keyChangeProducer := &producers.KeyChange{ keyChangeProducer := &producers.KeyChange{
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputKeyChangeEvent)), Topic: jetstream.OutputKeyChangeEvent,
Producer: producer, Producer: producer,
DB: db, DB: db,
} }

2
roomserver/roomserver.go
View file

@ -54,7 +54,7 @@ func NewInternalAPI(
} }
return internal.NewRoomserverAPI( return internal.NewRoomserverAPI(
cfg, roomserverDB, producer, string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputRoomEvent)), cfg, roomserverDB, producer, jetstream.OutputRoomEvent,
base.Caches, keyRing, perspectiveServerNames, base.Caches, keyRing, perspectiveServerNames,
) )
} }

4
roomserver/roomserver_test.go
View file

@ -166,7 +166,7 @@ func mustCreateRoomserverAPI(t *testing.T) (api.RoomserverInternalAPI, *dummyPro
ConnectionString: roomserverDBFileURI, ConnectionString: roomserverDBFileURI,
} }
dp := &dummyProducer{ dp := &dummyProducer{
topic: cfg.Global.JetStream.TopicFor(jetstream.OutputRoomEvent), topic: jetstream.OutputRoomEvent,
} }
cache, err := caching.NewInMemoryLRUCache(false) cache, err := caching.NewInMemoryLRUCache(false)
if err != nil { if err != nil {
@ -181,7 +181,7 @@ func mustCreateRoomserverAPI(t *testing.T) (api.RoomserverInternalAPI, *dummyPro
logrus.WithError(err).Panicf("failed to connect to room server db") logrus.WithError(err).Panicf("failed to connect to room server db")
} }
return internal.NewRoomserverAPI( return internal.NewRoomserverAPI(
&cfg.RoomServer, roomserverDB, dp, string(cfg.Global.JetStream.TopicFor(jetstream.OutputRoomEvent)), &cfg.RoomServer, roomserverDB, dp, jetstream.OutputRoomEvent,
base.Caches, &test.NopJSONVerifier{}, nil, base.Caches, &test.NopJSONVerifier{}, nil,
), dp ), dp
} }

2
syncapi/consumers/clientapi.go
View file

@ -51,7 +51,7 @@ func NewOutputClientDataConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "syncapi/clientapi", ComponentName: "syncapi/clientapi",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputClientData)), Topic: jetstream.OutputClientData,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
syncapi/consumers/eduserver_receipts.go
View file

@ -53,7 +53,7 @@ func NewOutputReceiptEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "syncapi/eduserver/receipt", ComponentName: "syncapi/eduserver/receipt",
Topic: cfg.Matrix.JetStream.TopicFor(jetstream.OutputReceiptEvent), Topic: jetstream.OutputReceiptEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
syncapi/consumers/eduserver_sendtodevice.go
View file

@ -56,7 +56,7 @@ func NewOutputSendToDeviceEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "syncapi/eduserver/sendtodevice", ComponentName: "syncapi/eduserver/sendtodevice",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputSendToDeviceEvent)), Topic: jetstream.OutputSendToDeviceEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
syncapi/consumers/eduserver_typing.go
View file

@ -54,7 +54,7 @@ func NewOutputTypingEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "syncapi/eduserver/typing", ComponentName: "syncapi/eduserver/typing",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputTypingEvent)), Topic: jetstream.OutputTypingEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
syncapi/consumers/roomserver.go
View file

@ -59,7 +59,7 @@ func NewOutputRoomEventConsumer(
consumer := internal.ContinualConsumer{ consumer := internal.ContinualConsumer{
Process: process, Process: process,
ComponentName: "syncapi/roomserver", ComponentName: "syncapi/roomserver",
Topic: string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputRoomEvent)), Topic: jetstream.OutputRoomEvent,
Consumer: kafkaConsumer, Consumer: kafkaConsumer,
PartitionStore: store, PartitionStore: store,
} }

2
syncapi/syncapi.go
View file

@ -65,7 +65,7 @@ func AddPublicRoutes(
requestPool := sync.NewRequestPool(syncDB, cfg, userAPI, keyAPI, rsAPI, streams, notifier) requestPool := sync.NewRequestPool(syncDB, cfg, userAPI, keyAPI, rsAPI, streams, notifier)
keyChangeConsumer := consumers.NewOutputKeyChangeEventConsumer( keyChangeConsumer := consumers.NewOutputKeyChangeEventConsumer(
process, cfg.Matrix.ServerName, string(cfg.Matrix.JetStream.TopicFor(jetstream.OutputKeyChangeEvent)), process, cfg.Matrix.ServerName, jetstream.OutputKeyChangeEvent,
consumer, keyAPI, rsAPI, syncDB, notifier, streams.DeviceListStreamProvider, consumer, keyAPI, rsAPI, syncDB, notifier, streams.DeviceListStreamProvider,
) )
if err = keyChangeConsumer.Start(); err != nil { if err = keyChangeConsumer.Start(); err != nil {