X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=22f52f074d3d8c74848cc94b044c83dd59f9a10a;hb=c4cf0feba4bc73d2c8ec23c2a83da609c99a3f9d;hp=2845ab1b67632177ef6bfdfdddee9d5a9adf88d1;hpb=c9d7601fc551069cd3a77da06a6333f22101a8a0;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index 2845ab1..22f52f0 100755
--- a/README.sh
+++ b/README.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE=juplo/sumup-adder:1.0-SNAPSHOT
+IMAGE=juplo/sumup-adder-json:1.0-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then
@@ -9,6 +9,8 @@ then
   exit
 fi
 
+docker-compose rm -svf 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,8 +18,8 @@ if [[
   "$1" = "build"
 ]]
 then
-  docker-compose rm -svf adder
-  mvn clean install || exit
+  docker-compose rm -svf adder-1 adder-2
+  mvn -D skipTests clean install || exit
 else
   echo "Using image existing images:"
   docker image ls $IMAGE
@@ -26,19 +28,63 @@ 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
 
 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
 
-echo 66  | http -v :8080/foo
-echo 666 | http -v :8080/bar
+docker-compose up -d peter klaus
 
-sleep 5
+docker-compose up -d 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
+http -v --pretty none -S :8091/results
+echo
 
-http -v :8082/state
-http -v :8082/state/foo
-http -v :8082/state/bar
+sleep 3
+echo "Resultate für adder-1"
+http -v --pretty none -S :8091/results
+echo
 
-docker-compose logs adder
+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 up -d 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
+http -v --pretty none -S :8092/results
+echo
+
+sleep 3
+echo "Resultate für adder-2"
+http -v --pretty none -S :8092/results
+echo
+
+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 stop adder-1
+until [ $(http --check-status :8092/results/peter 2> /dev/null) ]; do echo "Waiting for some results for peter to show up on adder-2..."; sleep 1; done
+until [ $(http --check-status :8092/results/klaus 2> /dev/null) ]; do echo "Waiting for some results for peter to show up on adder-2..."; sleep 1; done
+
+echo "Resultate für adder-2"
+http -v --pretty none -S :8092/results
+echo
+
+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 peter klaus