X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=README.sh;h=fbd0331df1db409a42b1695179a91f7a80be1e05;hb=924fb13cf514f79d2b01206476c2dea8536c8d44;hp=e7721440193078709072974088eafa6d7d4ea4c4;hpb=a22627477d23328b168e06cac2a807db1f1145f2;p=demos%2Fkafka%2Ftraining

diff --git a/README.sh b/README.sh
index e772144..fbd0331 100755
--- a/README.sh
+++ b/README.sh
@@ -9,7 +9,7 @@ then
   exit
 fi
 
-docker-compose stop adder
+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
 
@@ -18,7 +18,7 @@ if [[
   "$1" = "build"
 ]]
 then
-  docker-compose rm -svf adder
+  docker-compose rm -svf adder-1 adder-2
   mvn -D skipTests clean install || exit
 else
   echo "Using image existing images:"
@@ -28,23 +28,49 @@ 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
-
-docker-compose up -d peter
-
-while [[ "$(http :8082/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up..."; done
-http -v :8082/results
-sleep 3
-http -v :8082/results
-http :8082/results/peter | jq .[].sum | uniq
-docker-compose kill -s 9 adder
-
-docker-compose up -d adder
-docker-compose kill -s 9 peter
-while ! [[ $(http 0:8082/actuator/health 2> /dev/null) =~ "UP" ]]; do echo "Waiting for adder..."; sleep 1; done
-while [[ "$(http :8082/results | jq -r .)" == "{}" ]]; do echo "Waiting for some results to show up..."; sleep 1; done
-http :8082/results/peter | jq .[].sum | uniq
+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
+
+# tag::nachrichten[]
+echo 6 | http -v :8080/peter
+echo 6 | http -v :8080/klaus
+# end::nachrichten[]
+
+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"
+# tag::resultate[]
+http -v :8091/results
+# end::resultate[]
+
+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 adder-2"
+# tag::resultate[]
+http -v :8092/results
+# end::resultate[]
+
+docker-compose stop adder-1
+
+echo 66 | http -v :8080/peter
+echo 66 | http -v :8080/klaus
+sleep 1
+echo "Resultate für adder-2"
+http -v :8092/results
+
+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...";
+  echo 666 | http -v :8080/peter
+  echo 666 | http -v :8080/klaus
+  sleep 1;
+done
+echo "Resultate für adder-1"
+http -v :8091/results
+echo "Resultate für adder-2"
+http -v :8092/results