aboutsummaryrefslogtreecommitdiff
path: root/build/gobind-pinecone
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2021-11-25 11:18:01 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2021-11-25 11:18:01 +0000
commit11f588b0d603517be2c0509335c88b85b88f91f8 (patch)
tree93148d23e508b8c9ac71c6db65c6f9d87f5c9df7 /build/gobind-pinecone
parent310edd737ca52839ec8094e2847f5746e48bad69 (diff)
Fixes for multiple Pinecone peers
Diffstat (limited to 'build/gobind-pinecone')
-rw-r--r--build/gobind-pinecone/monolith.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index cd2809e4..9c739db3 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -76,7 +76,7 @@ func (m *DendriteMonolith) BaseURL() string {
}
func (m *DendriteMonolith) PeerCount(peertype int) int {
- return m.PineconeRouter.PeerCount(pineconeRouter.ConnectionPeerType(peertype))
+ return m.PineconeRouter.PeerCount(peertype)
}
func (m *DendriteMonolith) SessionCount() int {
@@ -209,7 +209,7 @@ func (m *DendriteMonolith) staticPeerConnect() {
return
}
for k := range connected {
- connected[k] = false
+ delete(connected, k)
}
for _, uri := range strings.Split(uri, ",") {
connected[strings.TrimSpace(uri)] = false
@@ -289,7 +289,7 @@ func (m *DendriteMonolith) Start() {
cfg.SyncAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-syncapi.db", m.StorageDirectory, prefix))
cfg.RoomServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-roomserver.db", m.StorageDirectory, prefix))
cfg.KeyServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-keyserver.db", m.StorageDirectory, prefix))
- cfg.FederationAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-federationapi.db", m.StorageDirectory, prefix))
+ cfg.FederationAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-federationsender.db", m.StorageDirectory, prefix))
cfg.AppServiceAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-appservice.db", m.StorageDirectory, prefix))
cfg.MediaAPI.BasePath = config.Path(fmt.Sprintf("%s/media", m.CacheDirectory))
cfg.MediaAPI.AbsBasePath = config.Path(fmt.Sprintf("%s/media", m.CacheDirectory))