[taler-deployment] branch master updated (05fd48c -> 2c9efdf)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository deployment.

    from 05fd48c  Remove unnecessary check
     new cab586a  remove verbosity
     new 2c9efdf  check if merchant runs

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/taler-deployment-config-instances-iban | 14 ++++----------
 bin/taler-deployment-prepare-with-eufin    |  2 --
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bin/taler-deployment-config-instances-iban 
b/bin/taler-deployment-config-instances-iban
index d17eec5..4f1abda 100755
--- a/bin/taler-deployment-config-instances-iban
+++ b/bin/taler-deployment-config-instances-iban
@@ -36,7 +36,6 @@ def wait_merchant_up():
     url = urljoin(MERCHANT_BACKEND_BASE_URL, "/config")
     print("Check URL: {}".format(url))
     while checks > 0:
-
         try:
             resp = requests.get(url, timeout=5)
         except Exception:
@@ -54,10 +53,8 @@ def wait_merchant_up():
         print("Merchant is up and running")
         return True
 
-    if checks == 0:
-        print("Merchant is not correctly serving requests.")
-        return False
-
+    print("Merchant is not correctly serving requests.")
+    return False
 
 MERCHANT_BACKEND_BASE_URL = expect_env("TALER_ENV_MERCHANT_BACKEND")
 TALER_ENV_NAME = expect_env("TALER_ENV_NAME")
@@ -67,7 +64,6 @@ authorization_header = {"Authorization": f"Bearer 
{TALER_ENV_FRONTENDS_APITOKEN}
 
 
 def ensure_instance(instance_id, name, payto_uris, auth):
-
     resp = requests.get(
         urljoin(MERCHANT_BACKEND_BASE_URL, 
f"management/instances/{instance_id}"),
         headers = authorization_header
@@ -127,13 +123,11 @@ def ensure_default_instance():
     if checks == 0:
         print("Could not stop the running merchant.")
         exit(1)
-
-    print("Successfully terminating the merchant.")
     # ARM is _not_ running the merchant at this point.
     env_with_token = environ.copy()
     env_with_token["TALER_MERCHANT_TOKEN"] = TALER_ENV_FRONTENDS_APITOKEN
     
-    print("Starting the merchant outside ARM, passing the token into the 
environment.")
+    print("Starting the merchant outside ARM to pass the token into the 
environment.")
     # Start the merchant natively.
     merchant = Popen(["taler-merchant-httpd"], env=env_with_token)
 
@@ -154,7 +148,7 @@ def ensure_default_instance():
     merchant.wait()
 
 ensure_default_instance()
-
+print("Restarting merchant _with_ ARM, to create other non-default instances.")
 system("taler-deployment-arm -s")
 system("taler-deployment-arm -i taler-merchant")
 wait_merchant_up()
diff --git a/bin/taler-deployment-prepare-with-eufin 
b/bin/taler-deployment-prepare-with-eufin
index dad07ac..22cb654 100755
--- a/bin/taler-deployment-prepare-with-eufin
+++ b/bin/taler-deployment-prepare-with-eufin
@@ -282,7 +282,6 @@ libeufin-cli \
       --host-id=$EBICS_HOST
 echo " OK"
 
-echo -n "Preparing accounts ..."
 export IBAN_EXCHANGE="DE89370400440532013000"
 export IBAN_MERCHANT="FR1420041010050500013M02606"
 export IBAN_CUSTOMER="FR1420041010050500013M02607"
@@ -306,7 +305,6 @@ prepare_sandbox_account \
   "Person Customer" \
   sandbox-account-customer \
   $IBAN_CUSTOMER
-echo "Sandbox preparation done"
 
 # Only the exchange needs Nexus.
 EXCHANGE_NEXUS_USERNAME=exchange-nexus-user

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.