From 8691ef5f0753f67ad37cc052c8bb50f528483e64 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 24 Feb 2020 18:10:15 +0000
Subject: [PATCH] Hard-code a config and don't use opentracing

---
 cmd/dendritejs/main.go       | 19 ++++++++++++++++++-
 common/basecomponent/base.go | 14 ++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go
index 0e8a07061..696e83f01 100644
--- a/cmd/dendritejs/main.go
+++ b/cmd/dendritejs/main.go
@@ -23,6 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/clientapi"
 	"github.com/matrix-org/dendrite/common"
 	"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/transactions"
 	"github.com/matrix-org/dendrite/federationapi"
@@ -51,7 +52,23 @@ var (
 )
 
 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")
 	defer base.Close() // nolint: errcheck
 
diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index d1d953f7b..83be5ff52 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -64,10 +64,11 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
 	common.SetupStdLogging()
 	common.SetupHookLogging(cfg.Logging, componentName)
 
-	closer, err := cfg.SetupTracing("Dendrite" + componentName)
-	if err != nil {
-		logrus.WithError(err).Panicf("failed to start opentracing")
-	}
+	// TODO: Make this optional
+	//closer, err := cfg.SetupTracing("Dendrite" + componentName)
+	//if err != nil {
+	//	logrus.WithError(err).Panicf("failed to start opentracing")
+	//}
 
 	var kafkaConsumer sarama.Consumer
 	var kafkaProducer sarama.SyncProducer
@@ -79,7 +80,7 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
 
 	return &BaseDendrite{
 		componentName: componentName,
-		tracerCloser:  closer,
+		//tracerCloser:  closer,
 		Cfg:           cfg,
 		APIMux:        mux.NewRouter().UseEncodedPath(),
 		KafkaConsumer: kafkaConsumer,
@@ -89,7 +90,8 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
 
 // Close implements io.Closer
 func (b *BaseDendrite) Close() error {
-	return b.tracerCloser.Close()
+	return nil
+	// return b.tracerCloser.Close()
 }
 
 // CreateHTTPAppServiceAPIs returns the QueryAPI for hitting the appservice