aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/dendrite-appservice-server/main.go6
-rw-r--r--cmd/dendrite-client-api-server/main.go6
-rw-r--r--cmd/dendrite-demo-libp2p/main.go4
-rw-r--r--cmd/dendrite-demo-libp2p/p2pdendrite.go6
-rw-r--r--cmd/dendrite-demo-yggdrasil/main.go9
-rw-r--r--cmd/dendrite-edu-server/main.go6
-rw-r--r--cmd/dendrite-federation-api-server/main.go6
-rw-r--r--cmd/dendrite-federation-sender-server/main.go6
-rw-r--r--cmd/dendrite-key-server/main.go6
-rw-r--r--cmd/dendrite-media-api-server/main.go6
-rw-r--r--cmd/dendrite-monolith-server/main.go13
-rw-r--r--cmd/dendrite-public-rooms-api-server/main.go6
-rw-r--r--cmd/dendrite-room-server/main.go6
-rw-r--r--cmd/dendrite-server-key-api-server/main.go6
-rw-r--r--cmd/dendrite-sync-api-server/main.go6
-rw-r--r--cmd/dendritejs/main.go7
16 files changed, 51 insertions, 54 deletions
diff --git a/cmd/dendrite-appservice-server/main.go b/cmd/dendrite-appservice-server/main.go
index fe00a117..ec68940a 100644
--- a/cmd/dendrite-appservice-server/main.go
+++ b/cmd/dendrite-appservice-server/main.go
@@ -16,12 +16,12 @@ package main
import (
"github.com/matrix-org/dendrite/appservice"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "AppServiceAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "AppServiceAPI", true)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go
index 9cf57ef6..8ed18c99 100644
--- a/cmd/dendrite-client-api-server/main.go
+++ b/cmd/dendrite-client-api-server/main.go
@@ -16,14 +16,14 @@ package main
import (
"github.com/matrix-org/dendrite/clientapi"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/internal/transactions"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
+ cfg := setup.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "ClientAPI", true)
+ base := setup.NewBaseDendrite(cfg, "ClientAPI", true)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go
index b7cbcdc9..f215606e 100644
--- a/cmd/dendrite-demo-libp2p/main.go
+++ b/cmd/dendrite-demo-libp2p/main.go
@@ -32,8 +32,8 @@ import (
"github.com/matrix-org/dendrite/cmd/dendrite-demo-libp2p/storage"
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/federationsender"
- "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/internal/httputil"
"github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/roomserver"
"github.com/matrix-org/dendrite/serverkeyapi"
@@ -172,7 +172,7 @@ func main() {
}
monolith.AddAllPublicRoutes(base.Base.PublicAPIMux)
- internal.SetupHTTPAPI(
+ httputil.SetupHTTPAPI(
http.DefaultServeMux,
base.Base.PublicAPIMux,
base.Base.InternalAPIMux,
diff --git a/cmd/dendrite-demo-libp2p/p2pdendrite.go b/cmd/dendrite-demo-libp2p/p2pdendrite.go
index b7c5c66b..4270143f 100644
--- a/cmd/dendrite-demo-libp2p/p2pdendrite.go
+++ b/cmd/dendrite-demo-libp2p/p2pdendrite.go
@@ -22,7 +22,7 @@ import (
pstore "github.com/libp2p/go-libp2p-core/peerstore"
record "github.com/libp2p/go-libp2p-record"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/libp2p/go-libp2p"
circuit "github.com/libp2p/go-libp2p-circuit"
@@ -39,7 +39,7 @@ import (
// P2PDendrite is a Peer-to-Peer variant of BaseDendrite.
type P2PDendrite struct {
- Base basecomponent.BaseDendrite
+ Base setup.BaseDendrite
// Store our libp2p object so that we can make outgoing connections from it
// later
@@ -54,7 +54,7 @@ type P2PDendrite struct {
// The componentName is used for logging purposes, and should be a friendly name
// of the component running, e.g. SyncAPI.
func NewP2PDendrite(cfg *config.Dendrite, componentName string) *P2PDendrite {
- baseDendrite := basecomponent.NewBaseDendrite(cfg, componentName, false)
+ baseDendrite := setup.NewBaseDendrite(cfg, componentName, false)
ctx, cancel := context.WithCancel(context.Background())
diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go
index 6ef56d32..e4d4fe9e 100644
--- a/cmd/dendrite-demo-yggdrasil/main.go
+++ b/cmd/dendrite-demo-yggdrasil/main.go
@@ -34,9 +34,8 @@ import (
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/federationsender"
- "github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/internal/httputil"
"github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/roomserver"
@@ -61,7 +60,7 @@ func (y *yggroundtripper) RoundTrip(req *http.Request) (*http.Response, error) {
}
func createFederationClient(
- base *basecomponent.BaseDendrite, n *yggconn.Node,
+ base *setup.BaseDendrite, n *yggconn.Node,
) *gomatrixserverlib.FederationClient {
yggdialer := func(_, address string) (net.Conn, error) {
tokens := strings.Split(address, ":")
@@ -135,7 +134,7 @@ func main() {
panic(err)
}
- base := basecomponent.NewBaseDendrite(cfg, "Monolith", false)
+ base := setup.NewBaseDendrite(cfg, "Monolith", false)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
@@ -188,7 +187,7 @@ func main() {
}
monolith.AddAllPublicRoutes(base.PublicAPIMux)
- internal.SetupHTTPAPI(
+ httputil.SetupHTTPAPI(
http.DefaultServeMux,
base.PublicAPIMux,
base.InternalAPIMux,
diff --git a/cmd/dendrite-edu-server/main.go b/cmd/dendrite-edu-server/main.go
index a86f66c8..1ecce884 100644
--- a/cmd/dendrite-edu-server/main.go
+++ b/cmd/dendrite-edu-server/main.go
@@ -17,13 +17,13 @@ import (
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/eduserver/cache"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/sirupsen/logrus"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "EDUServerAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "EDUServerAPI", true)
defer func() {
if err := base.Close(); err != nil {
logrus.WithError(err).Warn("BaseDendrite close failed")
diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go
index fcdc000c..b8db7927 100644
--- a/cmd/dendrite-federation-api-server/main.go
+++ b/cmd/dendrite-federation-api-server/main.go
@@ -16,12 +16,12 @@ package main
import (
"github.com/matrix-org/dendrite/federationapi"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "FederationAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "FederationAPI", true)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go
index 7b60ad05..20bc1070 100644
--- a/cmd/dendrite-federation-sender-server/main.go
+++ b/cmd/dendrite-federation-sender-server/main.go
@@ -16,12 +16,12 @@ package main
import (
"github.com/matrix-org/dendrite/federationsender"
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "FederationSender", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "FederationSender", true)
defer base.Close() // nolint: errcheck
federation := base.CreateFederationClient()
diff --git a/cmd/dendrite-key-server/main.go b/cmd/dendrite-key-server/main.go
index 5dccc300..06629d39 100644
--- a/cmd/dendrite-key-server/main.go
+++ b/cmd/dendrite-key-server/main.go
@@ -15,13 +15,13 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/keyserver"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "KeyServer", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "KeyServer", true)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
diff --git a/cmd/dendrite-media-api-server/main.go b/cmd/dendrite-media-api-server/main.go
index 5c65fad0..52c76027 100644
--- a/cmd/dendrite-media-api-server/main.go
+++ b/cmd/dendrite-media-api-server/main.go
@@ -15,13 +15,13 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/mediaapi"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "MediaAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "MediaAPI", true)
defer base.Close() // nolint: errcheck
deviceDB := base.CreateDeviceDB()
diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
index 2d538027..ea8160b8 100644
--- a/cmd/dendrite-monolith-server/main.go
+++ b/cmd/dendrite-monolith-server/main.go
@@ -23,9 +23,8 @@ import (
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/federationsender"
- "github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/internal/httputil"
"github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/roomserver"
@@ -45,7 +44,7 @@ var (
)
func main() {
- cfg := basecomponent.ParseFlags(true)
+ cfg := setup.ParseFlags(true)
if *enableHTTPAPIs {
// If the HTTP APIs are enabled then we need to update the Listen
// statements in the configuration so that we know where to find
@@ -59,7 +58,7 @@ func main() {
cfg.Listen.ServerKeyAPI = addr
}
- base := basecomponent.NewBaseDendrite(cfg, "Monolith", *enableHTTPAPIs)
+ base := setup.NewBaseDendrite(cfg, "Monolith", *enableHTTPAPIs)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
@@ -135,7 +134,7 @@ func main() {
}
monolith.AddAllPublicRoutes(base.PublicAPIMux)
- internal.SetupHTTPAPI(
+ httputil.SetupHTTPAPI(
http.DefaultServeMux,
base.PublicAPIMux,
base.InternalAPIMux,
@@ -147,7 +146,7 @@ func main() {
go func() {
serv := http.Server{
Addr: *httpBindAddr,
- WriteTimeout: basecomponent.HTTPServerTimeout,
+ WriteTimeout: setup.HTTPServerTimeout,
}
logrus.Info("Listening on ", serv.Addr)
@@ -158,7 +157,7 @@ func main() {
go func() {
serv := http.Server{
Addr: *httpsBindAddr,
- WriteTimeout: basecomponent.HTTPServerTimeout,
+ WriteTimeout: setup.HTTPServerTimeout,
}
logrus.Info("Listening on ", serv.Addr)
diff --git a/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go
index ff7d7958..3ba45dc6 100644
--- a/cmd/dendrite-public-rooms-api-server/main.go
+++ b/cmd/dendrite-public-rooms-api-server/main.go
@@ -15,15 +15,15 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/publicroomsapi"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/sirupsen/logrus"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "PublicRoomsAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "PublicRoomsAPI", true)
defer base.Close() // nolint: errcheck
deviceDB := base.CreateDeviceDB()
diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go
index a2f1e941..627a6867 100644
--- a/cmd/dendrite-room-server/main.go
+++ b/cmd/dendrite-room-server/main.go
@@ -15,13 +15,13 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/roomserver"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "RoomServerAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "RoomServerAPI", true)
defer base.Close() // nolint: errcheck
federation := base.CreateFederationClient()
diff --git a/cmd/dendrite-server-key-api-server/main.go b/cmd/dendrite-server-key-api-server/main.go
index b4bfcbff..9ffaeee3 100644
--- a/cmd/dendrite-server-key-api-server/main.go
+++ b/cmd/dendrite-server-key-api-server/main.go
@@ -15,13 +15,13 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/serverkeyapi"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "ServerKeyAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "ServerKeyAPI", true)
defer base.Close() // nolint: errcheck
federation := base.CreateFederationClient()
diff --git a/cmd/dendrite-sync-api-server/main.go b/cmd/dendrite-sync-api-server/main.go
index a5302f74..41e79680 100644
--- a/cmd/dendrite-sync-api-server/main.go
+++ b/cmd/dendrite-sync-api-server/main.go
@@ -15,13 +15,13 @@
package main
import (
- "github.com/matrix-org/dendrite/internal/basecomponent"
+ "github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/syncapi"
)
func main() {
- cfg := basecomponent.ParseFlags(false)
- base := basecomponent.NewBaseDendrite(cfg, "SyncAPI", true)
+ cfg := setup.ParseFlags(false)
+ base := setup.NewBaseDendrite(cfg, "SyncAPI", true)
defer base.Close() // nolint: errcheck
deviceDB := base.CreateDeviceDB()
diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go
index 0512ee5c..70672f4d 100644
--- a/cmd/dendritejs/main.go
+++ b/cmd/dendritejs/main.go
@@ -26,9 +26,8 @@ import (
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/federationsender"
- "github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/internal/httputil"
"github.com/matrix-org/dendrite/internal/setup"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/roomserver"
@@ -184,7 +183,7 @@ func main() {
if err := cfg.Derive(); err != nil {
logrus.Fatalf("Failed to derive values from config: %s", err)
}
- base := basecomponent.NewBaseDendrite(cfg, "Monolith", false)
+ base := setup.NewBaseDendrite(cfg, "Monolith", false)
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
@@ -233,7 +232,7 @@ func main() {
}
monolith.AddAllPublicRoutes(base.PublicAPIMux)
- internal.SetupHTTPAPI(
+ httputil.SetupHTTPAPI(
http.DefaultServeMux,
base.PublicAPIMux,
base.InternalAPIMux,
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-04 02:13:12 +0000