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

Put topic in the config file

Browse source
This commit is contained in:
Kegan Dougal 2017-03-10 15:50:39 +00:00
parent b1e9752986
commit dab39a3093
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/github.com/matrix-org/dendrite/clientapi/clientapi.go
View file

@ -48,10 +48,11 @@ func main() {
} }
cfg := config.ClientAPI{ cfg := config.ClientAPI{
ServerName: "localhost", ServerName: "localhost",
KeyID: "ed25519:something", KeyID: "ed25519:something",
PrivateKey: privKey, PrivateKey: privKey,
KafkaProducerURIs: []string{"localhost:9092"}, KafkaProducerURIs: []string{"localhost:9092"},
ClientAPIOutputTopic: "clientapiOutput",
} }
log.Info("Starting clientapi") log.Info("Starting clientapi")

2
src/github.com/matrix-org/dendrite/clientapi/config/config.go
View file

@ -13,4 +13,6 @@ type ClientAPI struct {
KeyID string KeyID string
// A list of URIs to send events to. These kafka logs should be consumed by a Room Server. // A list of URIs to send events to. These kafka logs should be consumed by a Room Server.
KafkaProducerURIs []string KafkaProducerURIs []string
// The topic for events which are written to the logs.
ClientAPIOutputTopic string
} }

6
src/github.com/matrix-org/dendrite/clientapi/writers/createroom.go
View file

@ -181,7 +181,7 @@ func createRoom(req *http.Request, cfg config.ClientAPI, roomID string, producer
} }
// send events to the room server // send events to the room server
msgs, err := eventsToMessages(builtEvents) msgs, err := eventsToMessages(builtEvents, cfg.ClientAPIOutputTopic)
if err != nil { if err != nil {
return util.ErrorResponse(err) return util.ErrorResponse(err)
} }
@ -252,7 +252,7 @@ func authEventsFromStateNeeded(eventsNeeded gomatrixserverlib.StateNeeded,
return return
} }
func eventsToMessages(events []*gomatrixserverlib.Event) ([]*sarama.ProducerMessage, error) { func eventsToMessages(events []*gomatrixserverlib.Event, topic string) ([]*sarama.ProducerMessage, error) {
msgs := make([]*sarama.ProducerMessage, len(events)) msgs := make([]*sarama.ProducerMessage, len(events))
for i, e := range events { for i, e := range events {
var m sarama.ProducerMessage var m sarama.ProducerMessage
@ -273,7 +273,7 @@ func eventsToMessages(events []*gomatrixserverlib.Event) ([]*sarama.ProducerMess
if err != nil { if err != nil {
return nil, err return nil, err
} }
m.Topic = "clientapiOutput" // TODO: Make this customisable like roomserver is? m.Topic = topic
m.Key = sarama.StringEncoder(e.EventID()) m.Key = sarama.StringEncoder(e.EventID())
m.Value = sarama.ByteEncoder(value) m.Value = sarama.ByteEncoder(value)
msgs[i] = &m msgs[i] = &m