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

Add SyncServer and remove needless abstractions

Browse source
This commit is contained in:
Kegan Dougal 2017-03-24 17:38:04 +00:00
parent 81943b63f3
commit 66db5a9f55
5 changed files with 57 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/github.com/matrix-org/dendrite/clientapi/consumers/roomserver.go
View file

@ -1,29 +0,0 @@
package consumers
import (
"github.com/matrix-org/dendrite/clientapi/config"
"github.com/matrix-org/dendrite/common"
sarama "gopkg.in/Shopify/sarama.v1"
)
// RoomserverConsumer consumes events from the room server
type RoomserverConsumer struct {
Consumer common.ContinualConsumer
}
// NewRoomserverConsumer creates a new roomserver consumer
func NewRoomserverConsumer(cfg *config.Sync, store common.PartitionStorer) (*RoomserverConsumer, error) {
kafkaConsumer, err := sarama.NewConsumer(cfg.KafkaConsumerURIs, nil)
if err != nil {
return nil, err
}
return &RoomserverConsumer{
Consumer: common.ContinualConsumer{
Topic: cfg.RoomserverOutputTopic,
Consumer: kafkaConsumer,
PartitionStore: store,
},
}, nil
}

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

@ -5,7 +5,6 @@ import (
"github.com/gorilla/mux"
"github.com/matrix-org/dendrite/clientapi/config"
"github.com/matrix-org/dendrite/clientapi/consumers"
"github.com/matrix-org/dendrite/clientapi/producers"
"github.com/matrix-org/dendrite/clientapi/readers"
"github.com/matrix-org/dendrite/clientapi/writers"
@ -49,8 +48,8 @@ func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg config.ClientAPI
servMux.Handle("/api/", http.StripPrefix("/api", apiMux))
}
// SetupSyncServer configures the given mux with sync-server listeners
func SetupSyncServer(servMux *http.ServeMux, httpClient *http.Client, cfg config.Sync, consumer *consumers.RoomserverConsumer) {
// SetupSyncServerListeners configures the given mux with sync-server listeners
func SetupSyncServerListeners(servMux *http.ServeMux, httpClient *http.Client, cfg config.Sync) {
apiMux := mux.NewRouter()
r0mux := apiMux.PathPrefix(pathPrefixR0).Subrouter()
r0mux.Handle("/sync", make("sync", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse {

18
src/github.com/matrix-org/dendrite/clientapi/storage/sync/sync.go → src/github.com/matrix-org/dendrite/clientapi/storage/syncserver.go
View file

@ -1,19 +1,21 @@
package sync
package storage
import (
"database/sql"
"github.com/matrix-org/dendrite/common"
// Import the postgres database driver.
_ "github.com/lib/pq"
)
// Database represents a sync server database
type Database struct {
// SyncServerDatabase represents a sync server database
type SyncServerDatabase struct {
db *sql.DB
partitions common.PartitionOffsetStatements
}
// NewDatabase creates a new sync server database
func NewDatabase(dataSourceName string) (*Database, error) {
// NewSyncServerDatabase creates a new sync server database
func NewSyncServerDatabase(dataSourceName string) (*SyncServerDatabase, error) {
var db *sql.DB
var err error
if db, err = sql.Open("postgres", dataSourceName); err != nil {
@ -23,15 +25,15 @@ func NewDatabase(dataSourceName string) (*Database, error) {
if err := partitions.Prepare(db); err != nil {
return nil, err
}
return &Database{db, partitions}, nil
return &SyncServerDatabase{db, partitions}, nil
}
// PartitionOffsets implements common.PartitionStorer
func (d *Database) PartitionOffsets(topic string) ([]common.PartitionOffset, error) {
func (d *SyncServerDatabase) PartitionOffsets(topic string) ([]common.PartitionOffset, error) {
return d.partitions.SelectPartitionOffsets(topic)
}
// SetPartitionOffset implements common.PartitionStorer
func (d *Database) SetPartitionOffset(topic string, partition int32, offset int64) error {
func (d *SyncServerDatabase) SetPartitionOffset(topic string, partition int32, offset int64) error {
return d.partitions.UpsertPartitionOffset(topic, partition, offset)
}

34
src/github.com/matrix-org/dendrite/clientapi/sync/syncserver.go Normal file
View file

@ -0,0 +1,34 @@
package sync
import (
"github.com/matrix-org/dendrite/clientapi/config"
"github.com/matrix-org/dendrite/common"
sarama "gopkg.in/Shopify/sarama.v1"
)
// Server contains all the logic for running a sync server
type Server struct {
roomServerConsumer *common.ContinualConsumer
}
// NewServer creates a new sync server. Call Start() to begin consuming from room servers.
func NewServer(cfg *config.Sync, store common.PartitionStorer) (*Server, error) {
kafkaConsumer, err := sarama.NewConsumer(cfg.KafkaConsumerURIs, nil)
if err != nil {
return nil, err
}
return &Server{
roomServerConsumer: &common.ContinualConsumer{
Topic: cfg.RoomserverOutputTopic,
Consumer: kafkaConsumer,
PartitionStore: store,
},
}, nil
}
// Start consuming from room servers
func (s *Server) Start() error {
return s.roomServerConsumer.Start()
}

19
src/github.com/matrix-org/dendrite/cmd/dendrite-sync-server/main.go
View file

@ -6,9 +6,9 @@ import (
"path/filepath"
"github.com/matrix-org/dendrite/clientapi/config"
"github.com/matrix-org/dendrite/clientapi/consumers"
"github.com/matrix-org/dendrite/clientapi/routing"
"github.com/matrix-org/dendrite/clientapi/storage/sync"
"github.com/matrix-org/dendrite/clientapi/storage"
"github.com/matrix-org/dendrite/clientapi/sync"
log "github.com/Sirupsen/logrus"
"github.com/matrix-org/dugong"
@ -42,21 +42,24 @@ func main() {
cfg := config.Sync{
KafkaConsumerURIs: []string{"localhost:9092"},
RoomserverOutputTopic: "roomserverOutput",
DataSource: "",
DataSource: "postgres://user:pass@localhost/dendrite-sync-server?sslmode=disable",
}
log.Info("Starting sync server")
db, err := sync.NewDatabase(cfg.DataSource)
db, err := storage.NewSyncServerDatabase(cfg.DataSource)
if err != nil {
log.Panicf("startup: failed to create database with data source %s : %s", cfg.DataSource, err)
log.Panicf("startup: failed to create sync server database with data source %s : %s", cfg.DataSource, err)
}
consumer, err := consumers.NewRoomserverConsumer(&cfg, db)
server, err := sync.NewServer(&cfg, db)
if err != nil {
log.Panicf("startup: failed to create roomserver consumer: %s", err)
log.Panicf("startup: failed to create sync server: %s", err)
}
if err = server.Start(); err != nil {
log.Panicf("startup: failed to start sync server")
}
routing.SetupSyncServer(http.DefaultServeMux, http.DefaultClient, cfg, consumer)
routing.SetupSyncServerListeners(http.DefaultServeMux, http.DefaultClient, cfg)
log.Fatal(http.ListenAndServe(bindAddr, nil))
}