aboutsummaryrefslogtreecommitdiff
path: root/federationsender
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-12-02 17:41:00 +0000
committerGitHub <noreply@github.com>2020-12-02 17:41:00 +0000
commitb5aa7ca3ab1c91397700637c91d60860a0535f1e (patch)
tree9da277c7b22027f09a7f45b0b0d771e44949e8f0 /federationsender
parent3ef6187e96ca2d68b3014bbd150e69971b6f7800 (diff)
Top-level setup package (#1605)
* Move config, setup, mscs into "setup" top-level folder * oops, forgot the EDU server * Add setup * goimports
Diffstat (limited to 'federationsender')
-rw-r--r--federationsender/consumers/eduserver.go2
-rw-r--r--federationsender/consumers/keychange.go2
-rw-r--r--federationsender/consumers/roomserver.go2
-rw-r--r--federationsender/federationsender.go4
-rw-r--r--federationsender/internal/api.go2
-rw-r--r--federationsender/storage/postgres/storage.go2
-rw-r--r--federationsender/storage/sqlite3/storage.go2
-rw-r--r--federationsender/storage/storage.go2
-rw-r--r--federationsender/storage/storage_wasm.go2
9 files changed, 10 insertions, 10 deletions
diff --git a/federationsender/consumers/eduserver.go b/federationsender/consumers/eduserver.go
index 9d7574e6..6d11eb88 100644
--- a/federationsender/consumers/eduserver.go
+++ b/federationsender/consumers/eduserver.go
@@ -24,7 +24,7 @@ import (
"github.com/matrix-org/dendrite/federationsender/queue"
"github.com/matrix-org/dendrite/federationsender/storage"
"github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
log "github.com/sirupsen/logrus"
diff --git a/federationsender/consumers/keychange.go b/federationsender/consumers/keychange.go
index 28244e92..5006ac28 100644
--- a/federationsender/consumers/keychange.go
+++ b/federationsender/consumers/keychange.go
@@ -23,9 +23,9 @@ import (
"github.com/matrix-org/dendrite/federationsender/queue"
"github.com/matrix-org/dendrite/federationsender/storage"
"github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/keyserver/api"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
)
diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go
index 873c1e98..13c415bc 100644
--- a/federationsender/consumers/roomserver.go
+++ b/federationsender/consumers/roomserver.go
@@ -24,8 +24,8 @@ import (
"github.com/matrix-org/dendrite/federationsender/storage"
"github.com/matrix-org/dendrite/federationsender/types"
"github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/roomserver/api"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
)
diff --git a/federationsender/federationsender.go b/federationsender/federationsender.go
index 7b75cb37..fc0ba6d5 100644
--- a/federationsender/federationsender.go
+++ b/federationsender/federationsender.go
@@ -23,9 +23,9 @@ import (
"github.com/matrix-org/dendrite/federationsender/queue"
"github.com/matrix-org/dendrite/federationsender/statistics"
"github.com/matrix-org/dendrite/federationsender/storage"
- "github.com/matrix-org/dendrite/internal/setup"
- "github.com/matrix-org/dendrite/internal/setup/kafka"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+ "github.com/matrix-org/dendrite/setup"
+ "github.com/matrix-org/dendrite/setup/kafka"
"github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
)
diff --git a/federationsender/internal/api.go b/federationsender/internal/api.go
index 31617045..a14cf3ca 100644
--- a/federationsender/internal/api.go
+++ b/federationsender/internal/api.go
@@ -9,8 +9,8 @@ import (
"github.com/matrix-org/dendrite/federationsender/queue"
"github.com/matrix-org/dendrite/federationsender/statistics"
"github.com/matrix-org/dendrite/federationsender/storage"
- "github.com/matrix-org/dendrite/internal/config"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrix"
"github.com/matrix-org/gomatrixserverlib"
)
diff --git a/federationsender/storage/postgres/storage.go b/federationsender/storage/postgres/storage.go
index b3b4da39..f314f849 100644
--- a/federationsender/storage/postgres/storage.go
+++ b/federationsender/storage/postgres/storage.go
@@ -19,8 +19,8 @@ import (
"database/sql"
"github.com/matrix-org/dendrite/federationsender/storage/shared"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
)
// Database stores information needed by the federation sender
diff --git a/federationsender/storage/sqlite3/storage.go b/federationsender/storage/sqlite3/storage.go
index ba467f02..4f663f64 100644
--- a/federationsender/storage/sqlite3/storage.go
+++ b/federationsender/storage/sqlite3/storage.go
@@ -21,8 +21,8 @@ import (
_ "github.com/mattn/go-sqlite3"
"github.com/matrix-org/dendrite/federationsender/storage/shared"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
)
// Database stores information needed by the federation sender
diff --git a/federationsender/storage/storage.go b/federationsender/storage/storage.go
index 1380fefd..f3613822 100644
--- a/federationsender/storage/storage.go
+++ b/federationsender/storage/storage.go
@@ -21,7 +21,7 @@ import (
"github.com/matrix-org/dendrite/federationsender/storage/postgres"
"github.com/matrix-org/dendrite/federationsender/storage/sqlite3"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
)
// NewDatabase opens a new database
diff --git a/federationsender/storage/storage_wasm.go b/federationsender/storage/storage_wasm.go
index 459329e9..c35b4828 100644
--- a/federationsender/storage/storage_wasm.go
+++ b/federationsender/storage/storage_wasm.go
@@ -18,7 +18,7 @@ import (
"fmt"
"github.com/matrix-org/dendrite/federationsender/storage/sqlite3"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
)
// NewDatabase opens a new database