hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-29 12:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Demo tweaks

Browse source
This commit is contained in:
Neil Alexander 2021-05-24 13:12:05 +01:00
parent 79c5485c8d
commit a7f2845a6a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/dendrite-demo-pinecone/conn/client.go
View file

@ -5,7 +5,6 @@ import (
"net"
"net/http"
"strings"
"time"
"github.com/gorilla/websocket"
"github.com/matrix-org/dendrite/setup"
@ -17,24 +16,15 @@ import (
func ConnectToPeer(pRouter *pineconeRouter.Router, peer string) error {
var parent net.Conn
dialer := net.Dialer{
Timeout: time.Second * 5,
KeepAlive: time.Second * 5,
}
if strings.HasPrefix(peer, "ws://") || strings.HasPrefix(peer, "wss://") {
wsdialer := websocket.Dialer{
NetDial: dialer.Dial,
NetDialContext: dialer.DialContext,
HandshakeTimeout: time.Second * 5,
}
c, _, err := wsdialer.Dial(peer, nil)
c, _, err := websocket.DefaultDialer.Dial(peer, nil)
if err != nil {
return fmt.Errorf("websocket.DefaultDialer.Dial: %w", err)
}
parent = WrapWebSocketConn(c)
} else {
var err error
parent, err = dialer.Dial("tcp", peer)
parent, err = net.Dial("tcp", peer)
if err != nil {
return fmt.Errorf("net.Dial: %w", err)
}