From 11f588b0d603517be2c0509335c88b85b88f91f8 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 25 Nov 2021 11:18:01 +0000 Subject: Fixes for multiple Pinecone peers --- cmd/dendrite-demo-pinecone/conn/client.go | 2 +- cmd/dendrite-demo-pinecone/main.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/dendrite-demo-pinecone/conn/client.go b/cmd/dendrite-demo-pinecone/conn/client.go index 14b648a3..e3cc0468 100644 --- a/cmd/dendrite-demo-pinecone/conn/client.go +++ b/cmd/dendrite-demo-pinecone/conn/client.go @@ -37,7 +37,7 @@ func ConnectToPeer(pRouter *pineconeRouter.Router, peer string) error { _, err := pRouter.Connect( parent, pineconeRouter.ConnectionZone("static"), - pineconeRouter.PeerTypeRemote, + pineconeRouter.ConnectionPeerType(pineconeRouter.PeerTypeRemote), pineconeRouter.ConnectionURI(peer), ) return err diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index 8ed3f349..cc7238ea 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -110,7 +110,10 @@ func main() { continue } - port, err := pRouter.Connect(conn, pineconeRouter.PeerTypeRemote) + port, err := pRouter.Connect( + conn, + pineconeRouter.ConnectionPeerType(pineconeRouter.PeerTypeRemote), + ) if err != nil { logrus.WithError(err).Error("pSwitch.Connect failed") continue @@ -242,7 +245,7 @@ func main() { if _, err = pRouter.Connect( conn, pineconeRouter.ConnectionZone("websocket"), - pineconeRouter.PeerTypeRemote, + pineconeRouter.ConnectionPeerType(pineconeRouter.PeerTypeRemote), ); err != nil { logrus.WithError(err).Error("Failed to connect WebSocket peer to Pinecone switch") } -- cgit v1.2.3