increase timeout for get_next, exit on any error, update deploy scripts

deploy/docker/cluster/asapo-start

@@ -6,8 +6,8 @@ if [ ! -f  /var/nomad/token ]; then
 	cp /var/nomad/token $TF_VAR_service_dir/nomad_token
 fi
 
-if [ -f /var/run/asapo/user_vars.tf ]; then
-  USER_VAR_FILE="-var-file=/var/run/asapo/user_vars.tf"
+if [ -f /var/run/asapo/user_vars.tfvars ]; then
+  USER_VAR_FILE="-var-file=/var/run/asapo/user_vars.tfvars"
 fi
 
 cd /var/run/asapo && terraform apply -auto-approve $USER_VAR_FILE "$@"
\ No newline at end of file

deploy/docker/cluster/run_maxwell.sh

@@ -14,7 +14,7 @@ RECURSORS=["\"131.169.40.200\"",\""131.169.194.200\""]
 
 ASAPO_USER=`id -u`:`id -g`
 
-ASAPO_VAR_FILE=`pwd`/asapo_overwrite_vars.tf
+ASAPO_VAR_FILE=`pwd`/asapo_overwrite_vars.tfvars
 
 
 # use ib interface for service discovery (all communications goes thourgh this interface)
@@ -60,7 +60,7 @@ docker rm -f asapo
 docker pull yakser/asapo-cluster
 
 if [ -f $ASAPO_VAR_FILE ]; then
-  MOUNT_VAR_FILE="-v $ASAPO_VAR_FILE:/var/run/asapo/user_vars.tf"
+  MOUNT_VAR_FILE="-v $ASAPO_VAR_FILE:/var/run/asapo/user_vars.tfvars"
 fi
 
 dockerrun --rm  \

deploy/docker/cluster/scripts/kibana.yml

 elasticsearch:
-  url: "http://localhost:8400/elasticsearch"
+  hosts: ["http://localhost:8400/elasticsearch"]
 server:
   basePath:   "/logsview"
   rewriteBasePath: true

examples/consumer/getnext_broker/check_linux.sh

@@ -30,7 +30,7 @@ done
 
 sleep 1
 
-$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 1000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
+$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 12000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
 
 
 

examples/consumer/getnext_broker/check_windows.bat

@@ -16,7 +16,7 @@ ping 1.0.0.0 -n 10 -w 100 > nul
 for /l %%x in (1, 1, 3) do echo db.data.insert({"_id":%%x,"size":100,"name":"%%x","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
-"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 1000 1 | findstr /c:"Processed 3 file" || goto :error
+"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 12000 1 | findstr /c:"Processed 3 file" || goto :error
 goto :clean
 
 :error

examples/consumer/getnext_broker/getnext_broker.cpp

@@ -98,7 +98,7 @@ std::vector<std::thread> StartThreads(const Args& params,
 
             if (err) {
                 (*errors)[i] += ProcessError(err);
-                if (err != asapo::ConsumerErrorTemplates::kNoData ) {
+                if (err) {
                     std::cout << "Thread exit: " << i << std::endl;
                     break;
                 }