X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=500552d51a6fa6174611010a5060ae8bbcff3d86;hb=6bfbab41a28c8fb6252d328954f5b7129b24ec25;hp=05178a3403379e5f3615e298b1da19007e24095e;hpb=40c2e597c8b695fe3d5e2675ce0c1a975b0065bd;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 05178a3..500552d 100755
--- a/README.sh
+++ b/README.sh
@@ -9,6 +9,8 @@ then
   exit
 fi
 
+docker-compose stop adder-1 adder-2
+docker-compose rm -svf mongo
 docker-compose up -d zookeeper kafka-1 kafka-2 kafka-3 cli mongo express
 
 if [[
@@ -16,7 +18,7 @@ if [[
   "$1" = "build"
 ]]
 then
-  docker-compose rm -svf adder
+  docker-compose rm -svf adder-1 adder-2
   mvn clean install || exit
 else
   echo "Using image existing images:"
@@ -26,21 +28,77 @@ fi
 echo "Waiting for the Kafka-Cluster to become ready..."
 docker-compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
 docker-compose up setup
-docker-compose up -d gateway requests adder
+docker-compose up -d gateway requests-1 requests-2 adder-1 adder-2
 
 while ! [[ $(http 0:8080/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for gateway..."; sleep 1; done
-while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests..."; sleep 1; done
-while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
+while ! [[ $(http 0:8081/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests-1..."; sleep 1; done
+while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for requests-2..."; sleep 1; done
+while ! [[ $(http 0:8091/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-1..."; sleep 1; done
+while ! [[ $(http 0:8092/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-2..."; sleep 1; done
 
-docker-compose up -d peter ute franz beate klaus uschi
+docker-compose up -d peter klaus
 
-http -v :8082/results
+while [[ "$(http :8091/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-1..."; sleep 1; done
+http -v :8091/results
+while [[ "$(http :8092/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-2..."; sleep 1; done
+http -v :8092/results
 sleep 3
-http -v :8082/results
+echo "Resultate für adder-1"
+http -v :8091/results
+echo "Resultate für peter von adder-1"
+http :8091/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-1"
+http :8091/results/klaus | jq .[].sum | uniq
+echo "Resultate für adder-2"
+http -v :8092/results
+echo "Resultate für peter von adder-2"
+http :8092/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-2"
+http :8092/results/klaus | jq .[].sum | uniq
 
-docker-compose kill -s 9 adder
+docker-compose stop adder-1
+sleep 1
+echo "Resultate für adder-2"
+http -v :8092/results
+echo "Resultate für peter von adder-2"
+http :8092/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-2"
+http :8092/results/klaus | jq .[].sum | uniq
 
-docker-compose up -d adder
-sleep 3
-docker-compose kill -s 9 peter ute franz beate klaus uschi
-http -v :8082/results
+docker-compose stop adder-2
+docker-compose start adder-1
+while ! [[ $(http 0:8091/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-1..."; sleep 1; done
+while [[ "$(http :8091/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-1..."; sleep 1; done
+echo "Resultate für adder-1"
+http -v :8091/results
+echo "Resultate für peter von adder-1"
+http :8091/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-1"
+http :8091/results/klaus | jq .[].sum | uniq
+
+docker-compose start adder-2
+while ! [[ $(http 0:8092/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-2..."; sleep 1; done
+while [[ "$(http :8092/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-2..."; sleep 1; done
+echo "Resultate für peter von adder-1"
+http :8091/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-1"
+http :8091/results/klaus | jq .[].sum | uniq
+echo "Resultate für peter von adder-2"
+http :8092/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-2"
+http :8092/results/klaus | jq .[].sum | uniq
+
+docker-compose kill -s 9 adder-1
+
+docker-compose start adder-1
+while ! [[ $(http 0:8091/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder-1..."; sleep 1; done
+while [[ "$(http :8091/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up on adder-1..."; sleep 1; done
+docker-compose kill -s 9 peter klaus
+echo "Resultate für peter von adder-1"
+http :8091/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-1"
+http :8091/results/klaus | jq .[].sum | uniq
+echo "Resultate für peter von adder-2"
+http :8092/results/peter | jq .[].sum | uniq
+echo "Resultate für klaus von adder-2"
+http :8092/results/klaus | jq .[].sum | uniq