diff --git a/gossip/monitor/monitor.go b/gossip/monitor/monitor.go index bb167daaa..aefb25596 100644 --- a/gossip/monitor/monitor.go +++ b/gossip/monitor/monitor.go @@ -31,7 +31,7 @@ import ( ) type Config struct { - QedUrls []string + QEDUrls []string PubUrls []string APIKey string TaskExecutionInterval time.Duration @@ -58,8 +58,8 @@ func NewMonitor(conf Config) (*Monitor, error) { monitor := Monitor{ client: client.NewHTTPClient(client.Config{ - Endpoint: conf.QedUrls[0], - APIKey: conf.APIKey, + Endpoint: conf.QEDUrls[0], + APIKey: conf.APIKey, Insecure: false, }), conf: conf, diff --git a/tests/e2e/setup.go b/tests/e2e/setup.go index be5cc4028..5b24209d3 100644 --- a/tests/e2e/setup.go +++ b/tests/e2e/setup.go @@ -118,7 +118,7 @@ func setupMonitor(id int, t *testing.T) (scope.TestF, scope.TestF) { before := func(t *testing.T) { monitorConf := monitor.DefaultConfig() - monitorConf.QedUrls = []string{QEDUrl} + monitorConf.QEDUrls = []string{QEDUrl} monitorConf.PubUrls = []string{StoreURL} monitorConf.APIKey = APIKey diff --git a/tests/gossip/run_gossip.sh b/tests/gossip/run_gossip.sh index 9fee18a83..9b7b14504 100755 --- a/tests/gossip/run_gossip.sh +++ b/tests/gossip/run_gossip.sh @@ -23,7 +23,14 @@ if [ ! -f "$keyFile" ]; then echo -e 'y\n' | ssh-keygen -t ed25519 -N '' -f /var/tmp/id_ed25519 fi -$QED start -k key -l silent --node-id server0 --gossip-addr $qedGossipEndpoint --raft-addr 127.0.0.1:8500 -y $keyFile & +$QED start \ + -k key \ + -l silent \ + --node-id server0 \ + --gossip-addr $qedGossipEndpoint \ + --raft-addr 127.0.0.1:8500 \ + --keypath $keyFile & + pids[0]=$! sleep 2s @@ -41,7 +48,7 @@ done for i in `seq 1 $3`; do - xterm -hold -e "$QED agent --alertsUrls $alertsStoreEndpoint publisher -k key -l info --bind 127.0.0.1:830$i --join $qedGossipEndpoint --endpoints $snapshotStoreEndpoint --node publisher$i" & + xterm -hold -e "$QED agent --alertsUrls $alertsStoreEndpoint publisher -k key -l info --bind 127.0.0.1:830$i --join $qedGossipEndpoint --pubUrls $snapshotStoreEndpoint --node publisher$i" & pids+=($!) done