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

Hard-code a config and don't use opentracing

Browse source
This commit is contained in:
Kegan Dougal 2020-02-24 18:10:15 +00:00
parent 48c7e3c172
commit 8691ef5f07
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/dendritejs/main.go
View file

@ -23,6 +23,7 @@ import (
"github.com/matrix-org/dendrite/clientapi" "github.com/matrix-org/dendrite/clientapi"
"github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/basecomponent" "github.com/matrix-org/dendrite/common/basecomponent"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/common/keydb" "github.com/matrix-org/dendrite/common/keydb"
"github.com/matrix-org/dendrite/common/transactions" "github.com/matrix-org/dendrite/common/transactions"
"github.com/matrix-org/dendrite/federationapi" "github.com/matrix-org/dendrite/federationapi"
@ -51,7 +52,23 @@ var (
) )
func main() { func main() {
cfg := basecomponent.ParseMonolithFlags() cfg := &config.Dendrite{}
cfg.Kafka.UseNaffka = true
cfg.Database.Account = "file:dendritejs_account.db"
cfg.Database.AppService = "file:dendritejs_appservice.db"
cfg.Database.Device = "file:dendritejs_device.db"
cfg.Database.FederationSender = "file:dendritejs_fedsender.db"
cfg.Database.MediaAPI = "file:dendritejs_mediaapi.db"
cfg.Database.Naffka = "file:dendritejs_naffka.db"
cfg.Database.PublicRoomsAPI = "file:dendritejs_publicrooms.db"
cfg.Database.RoomServer = "file:dendritejs_roomserver.db"
cfg.Database.ServerKey = "file:dendritejs_serverkey.db"
cfg.Database.SyncAPI = "file:dendritejs_syncapi.db"
cfg.Matrix.ServerName = "localhost"
cfg.Matrix.TrustedIDServers = []string{
"matrix.org", "vector.im",
}
base := basecomponent.NewBaseDendrite(cfg, "Monolith") base := basecomponent.NewBaseDendrite(cfg, "Monolith")
defer base.Close() // nolint: errcheck defer base.Close() // nolint: errcheck

14
common/basecomponent/base.go
View file

@ -64,10 +64,11 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
common.SetupStdLogging() common.SetupStdLogging()
common.SetupHookLogging(cfg.Logging, componentName) common.SetupHookLogging(cfg.Logging, componentName)
closer, err := cfg.SetupTracing("Dendrite" + componentName) // TODO: Make this optional
if err != nil { //closer, err := cfg.SetupTracing("Dendrite" + componentName)
logrus.WithError(err).Panicf("failed to start opentracing") //if err != nil {
} // logrus.WithError(err).Panicf("failed to start opentracing")
//}
var kafkaConsumer sarama.Consumer var kafkaConsumer sarama.Consumer
var kafkaProducer sarama.SyncProducer var kafkaProducer sarama.SyncProducer
@ -79,7 +80,7 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
return &BaseDendrite{ return &BaseDendrite{
componentName: componentName, componentName: componentName,
tracerCloser: closer, //tracerCloser: closer,
Cfg: cfg, Cfg: cfg,
APIMux: mux.NewRouter().UseEncodedPath(), APIMux: mux.NewRouter().UseEncodedPath(),
KafkaConsumer: kafkaConsumer, KafkaConsumer: kafkaConsumer,
@ -89,7 +90,8 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
// Close implements io.Closer // Close implements io.Closer
func (b *BaseDendrite) Close() error { func (b *BaseDendrite) Close() error {
return b.tracerCloser.Close() return nil
// return b.tracerCloser.Close()
} }
// CreateHTTPAppServiceAPIs returns the QueryAPI for hitting the appservice // CreateHTTPAppServiceAPIs returns the QueryAPI for hitting the appservice