deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-21 23:16:34 +02:00
Code Issues Releases Wiki Activity

Update for changed etcd config API.

Browse source
This commit is contained in:
Joachim Bauch 2023-06-12 11:42:13 +02:00
parent 186c7bf052
commit 73808f5a68
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
etcd_client_test.go
View file

@ -79,12 +79,12 @@ func NewEtcdForTest(t *testing.T) *embed.Etcd {
var etcd *embed.Etcd
for port := 50000; port < 50100; port++ {
u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
cfg.LCUrls = []url.URL{*u}
cfg.ACUrls = []url.URL{*u}
cfg.ListenClientUrls = []url.URL{*u}
cfg.AdvertiseClientUrls = []url.URL{*u}
peerListener := u
peerListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+1))
cfg.LPUrls = []url.URL{*peerListener}
cfg.APUrls = []url.URL{*peerListener}
cfg.ListenPeerUrls = []url.URL{*peerListener}
cfg.AdvertisePeerUrls = []url.URL{*peerListener}
cfg.InitialCluster = "default=" + peerListener.String()
etcd, err = embed.StartEtcd(cfg)
if isErrorAddressAlreadyInUse(err) {
@ -111,7 +111,7 @@ func NewEtcdClientForTest(t *testing.T) (*embed.Etcd, *EtcdClient) {
etcd := NewEtcdForTest(t)
config := goconf.NewConfigFile()
config.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
config.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
client, err := NewEtcdClient(config, "")
if err != nil {

2
grpc_client_test.go
View file

@ -58,7 +58,7 @@ func NewGrpcClientsForTest(t *testing.T, addr string) *GrpcClients {
func NewGrpcClientsWithEtcdForTest(t *testing.T, etcd *embed.Etcd) *GrpcClients {
config := goconf.NewConfigFile()
config.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
config.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
config.AddOption("grpc", "targettype", "etcd")
config.AddOption("grpc", "targetprefix", "/grpctargets")

4
proxy/proxy_tokens_etcd_test.go
View file

@ -79,7 +79,7 @@ func newEtcdForTesting(t *testing.T) *embed.Etcd {
var etcd *embed.Etcd
for port := 50000; port < 50100; port++ {
u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
cfg.LCUrls = []url.URL{*u}
cfg.ListenClientUrls = []url.URL{*u}
etcd, err = embed.StartEtcd(cfg)
if isErrorAddressAlreadyInUse(err) {
continue
@ -105,7 +105,7 @@ func newTokensEtcdForTesting(t *testing.T) (*tokensEtcd, *embed.Etcd) {
etcd := newEtcdForTesting(t)
cfg := goconf.NewConfigFile()
cfg.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
cfg.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
cfg.AddOption("tokens", "keyformat", "/%s, /testing/%s/key")
tokens, err := NewProxyTokensEtcd(cfg)