Update start scripts with new options

BBVA · Apr 10, 2019 · d36dc3d · d36dc3d
1 parent e86fec6
commit d36dc3d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/tests/start_agent b/tests/start_agent
@@ -25,11 +25,11 @@ AGENT_CONFIG+=('--start-join 127.0.0.1:8400')
 
 # Notifier options
 NOTIFIER_CONFIG=()
-NOTIFIER_CONFIG+=('--notifier-servers http://127.0.0.1:8888')
+NOTIFIER_CONFIG+=('--notifier-endpoint http://127.0.0.1:8888/alert')
 
 # Snapshot store options
 STORE_CONFIG=()
-STORE_CONFIG+=('--store-servers http://127.0.0.1:8888')
+STORE_CONFIG+=('--store-endpoint http://127.0.0.1:8888')
 
 # Task manager options
 TASKS_CONFIG=()
@@ -41,16 +41,16 @@ QED_CONFIG+=("--qed-endpoints http://127.0.0.1:8800")
 
 
 MONITOR_CONFIG=("${AGENT_CONFIG[@]}" "${NOTIFIER_CONFIG[@]}" "${STORE_CONFIG[@]}" "${TASKS_CONFIG[@]}" "${QED_CONFIG[@]}")
-MONITOR_CONFIG+=("--role monitor")
-MONITOR_CONFIG+=("--node-name monitor${i}")
+MONITOR_CONFIG+=('--role monitor')
+MONITOR_CONFIG+=('--node-name monitor${i}')
 
 PUBLISHER_CONFIG=("${AGENT_CONFIG[@]}" "${NOTIFIER_CONFIG[@]}" "${STORE_CONFIG[@]}" "${TASKS_CONFIG[@]}" )
-PUBLISHER_CONFIG+=("--role publisher")
-PUBLISHER_CONFIG+=("--node-name publisher${i}")
+PUBLISHER_CONFIG+=('--role publisher')
+PUBLISHER_CONFIG+=('--node-name publisher${i}')
 
-AUDITOR_CONFIG=("${AGENT_CONFIG[@]}" "${NOTIFIER_CONFIG[@]}" "${STORE_CONFIG[@]}" "${TASKS_CONFIG[@]}" )
-AUDITOR_CONFIG+=("--role auditor")
-AUDITOR_CONFIG+=("--node-name auditor${i}")
+AUDITOR_CONFIG=("${AGENT_CONFIG[@]}" "${NOTIFIER_CONFIG[@]}" "${STORE_CONFIG[@]}" "${TASKS_CONFIG[@]}" "${QED_CONFIG[@]}")
+AUDITOR_CONFIG+=('--role auditor')
+AUDITOR_CONFIG+=('--node-name auditor${i}')
 
 start() {
 	local type="$1"
@@ -72,7 +72,8 @@ start() {
 	    ;;
 	esac
 	echo CONFIG $conf
-	$QED agent $type $conf &
+	mkdir -p /var/tmp/qed-$type-$id/
+	$QED agent $type $conf 2>&1 | tee  /var/tmp/qed-$type-$id/agent.log &
 	pids+=($!)
 }
 

diff --git a/tests/start_all_xterm b/tests/start_all_xterm
@@ -16,11 +16,10 @@
 
 # Starts a local test setup
 
-xterm -hold -e "go run test_service.go" &
+xterm -hold -e "go run $GOPATH/src/github.com/bbva/qed/testutils/notifierstore.go" &
 
 xterm -hold -e "bash start_server" &
 
 sleep 3s
 
-xterm -hold -e "bash start_agent monitor publisher" &
-
+xterm -hold -e "bash start_agent monitor publisher auditor" &
diff --git a/tests/start_server b/tests/start_server
@@ -39,20 +39,25 @@ LEADER_CONFIG+=('--raft-addr 127.0.0.1:850${i}')
 LEADER_CONFIG+=('--raft-path /var/tmp/qed${i}/wal')
 
 FOLLOWER_CONFIG=("${LEADER_CONFIG[@]}")
-FOLLOWER_CONFIG+=("--gossip-join-addr 127.0.0.1:8400")
+FOLLOWER_CONFIG+=('--gossip-join-addr 127.0.0.1:8400')
 
 pids=()
 
-mkdir -p /var/tmp/qed0/server.log
+n="$1"
+if [ -z $n ]; then
+	n=0
+fi
+
+mkdir -p /var/tmp/qed-log-0
 leader=$(echo ${LEADER_CONFIG[@]} | i=0 envsubst )
-$QED server start $leader 2>&1 | tee  /var/tmp/qed0/server.log &
+$QED server start $leader 2>&1 | tee  /var/tmp/qed-log-0/server.log &
 pids+=($!)
 sleep 3s
 
-for id in $(seq 1 1 $1); do
+for id in $(seq 1 1 $n); do
 	mkdir -p /var/tmp/qed${id}
 	follower=$(echo ${FOLLOWER_CONFIG[@]} | i=$id envsubst )
-	$QED server start $follower 2>&1 | tee  /var/tmp/qed${id}/server.log &
+	$QED server start $follower 2>&1 | tee  /var/tmp/qed-log-${id}/server.log &
 	pids+=($!)
 	sleep 3s
 done