mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-18 15:50:52 +01:00
29841bed6b
This PR adds a new consumer for typing notifications in syncapi. It also brings changes to syncserver.go and some related files so EDUs can better fit in /sync responses. Fixes #635. Fixes #574.
96 lines
3.1 KiB
Go
96 lines
3.1 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package consumers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"github.com/matrix-org/dendrite/common"
|
|
"github.com/matrix-org/dendrite/common/config"
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
|
"github.com/matrix-org/dendrite/syncapi/sync"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
log "github.com/sirupsen/logrus"
|
|
sarama "gopkg.in/Shopify/sarama.v1"
|
|
)
|
|
|
|
// OutputClientDataConsumer consumes events that originated in the client API server.
|
|
type OutputClientDataConsumer struct {
|
|
clientAPIConsumer *common.ContinualConsumer
|
|
db *storage.SyncServerDatasource
|
|
notifier *sync.Notifier
|
|
}
|
|
|
|
// NewOutputClientDataConsumer creates a new OutputClientData consumer. Call Start() to begin consuming from room servers.
|
|
func NewOutputClientDataConsumer(
|
|
cfg *config.Dendrite,
|
|
kafkaConsumer sarama.Consumer,
|
|
n *sync.Notifier,
|
|
store *storage.SyncServerDatasource,
|
|
) *OutputClientDataConsumer {
|
|
|
|
consumer := common.ContinualConsumer{
|
|
Topic: string(cfg.Kafka.Topics.OutputClientData),
|
|
Consumer: kafkaConsumer,
|
|
PartitionStore: store,
|
|
}
|
|
s := &OutputClientDataConsumer{
|
|
clientAPIConsumer: &consumer,
|
|
db: store,
|
|
notifier: n,
|
|
}
|
|
consumer.ProcessMessage = s.onMessage
|
|
|
|
return s
|
|
}
|
|
|
|
// Start consuming from room servers
|
|
func (s *OutputClientDataConsumer) Start() error {
|
|
return s.clientAPIConsumer.Start()
|
|
}
|
|
|
|
// onMessage is called when the sync server receives a new event from the client API server output log.
|
|
// It is not safe for this function to be called from multiple goroutines, or else the
|
|
// sync stream position may race and be incorrectly calculated.
|
|
func (s *OutputClientDataConsumer) onMessage(msg *sarama.ConsumerMessage) error {
|
|
// Parse out the event JSON
|
|
var output common.AccountData
|
|
if err := json.Unmarshal(msg.Value, &output); err != nil {
|
|
// If the message was invalid, log it and move on to the next message in the stream
|
|
log.WithError(err).Errorf("client API server output log: message parse failure")
|
|
return nil
|
|
}
|
|
|
|
log.WithFields(log.Fields{
|
|
"type": output.Type,
|
|
"room_id": output.RoomID,
|
|
}).Info("received data from client API server")
|
|
|
|
pduPos, err := s.db.UpsertAccountData(
|
|
context.TODO(), string(msg.Key), output.RoomID, output.Type,
|
|
)
|
|
if err != nil {
|
|
log.WithFields(log.Fields{
|
|
"type": output.Type,
|
|
"room_id": output.RoomID,
|
|
log.ErrorKey: err,
|
|
}).Panicf("could not save account data")
|
|
}
|
|
|
|
s.notifier.OnNewEvent(nil, "", []string{string(msg.Key)}, types.SyncPosition{PDUPosition: pduPos})
|
|
|
|
return nil
|
|
}
|