diff options
| author | Kegsay <kegan@matrix.org> | 2020-05-21 14:40:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 14:40:13 +0100 |
| commit | 24d8df664c21fa8bd68d80b5585a496e264c410a (patch) | |
| tree | 0a176d6dfd7f81522c5739b53313366b552b0ce1 /federationsender/consumers | |
| parent | 3fdb045116c9cd2f2a3badfebec0645d0381bacb (diff) | |
Fix #897 and shuffle directory around (#1054)
* Fix #897 and shuffle directory around
* Update find-lint
* goimports
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'federationsender/consumers')
| -rw-r--r-- | federationsender/consumers/eduserver.go | 8 | ||||
| -rw-r--r-- | federationsender/consumers/roomserver.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/federationsender/consumers/eduserver.go b/federationsender/consumers/eduserver.go index 269701d7..bcebb3ce 100644 --- a/federationsender/consumers/eduserver.go +++ b/federationsender/consumers/eduserver.go @@ -17,18 +17,18 @@ import ( "encoding/json" "github.com/Shopify/sarama" - "github.com/matrix-org/dendrite/common" - "github.com/matrix-org/dendrite/common/config" "github.com/matrix-org/dendrite/eduserver/api" "github.com/matrix-org/dendrite/federationsender/queue" "github.com/matrix-org/dendrite/federationsender/storage" + "github.com/matrix-org/dendrite/internal" + "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/gomatrixserverlib" log "github.com/sirupsen/logrus" ) // OutputTypingEventConsumer consumes events that originate in EDU server. type OutputTypingEventConsumer struct { - consumer *common.ContinualConsumer + consumer *internal.ContinualConsumer db storage.Database queues *queue.OutgoingQueues ServerName gomatrixserverlib.ServerName @@ -41,7 +41,7 @@ func NewOutputTypingEventConsumer( queues *queue.OutgoingQueues, store storage.Database, ) *OutputTypingEventConsumer { - consumer := common.ContinualConsumer{ + consumer := internal.ContinualConsumer{ Topic: string(cfg.Kafka.Topics.OutputTypingEvent), Consumer: kafkaConsumer, PartitionStore: store, diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go index 90123947..5f8a555b 100644 --- a/federationsender/consumers/roomserver.go +++ b/federationsender/consumers/roomserver.go @@ -20,11 +20,11 @@ import ( "fmt" "github.com/Shopify/sarama" - "github.com/matrix-org/dendrite/common" - "github.com/matrix-org/dendrite/common/config" "github.com/matrix-org/dendrite/federationsender/queue" "github.com/matrix-org/dendrite/federationsender/storage" "github.com/matrix-org/dendrite/federationsender/types" + "github.com/matrix-org/dendrite/internal" + "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" log "github.com/sirupsen/logrus" @@ -35,7 +35,7 @@ import ( type OutputRoomEventConsumer struct { cfg *config.Dendrite rsAPI api.RoomserverInternalAPI - rsConsumer *common.ContinualConsumer + rsConsumer *internal.ContinualConsumer db storage.Database queues *queue.OutgoingQueues } @@ -48,7 +48,7 @@ func NewOutputRoomEventConsumer( store storage.Database, rsAPI api.RoomserverInternalAPI, ) *OutputRoomEventConsumer { - consumer := common.ContinualConsumer{ + consumer := internal.ContinualConsumer{ Topic: string(cfg.Kafka.Topics.OutputRoomEvent), Consumer: kafkaConsumer, PartitionStore: store, |