gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-deployment] branch master updated: fix condition check


From: gnunet
Subject: [taler-deployment] branch master updated: fix condition check
Date: Tue, 25 May 2021 22:51:36 +0200

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

ms pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 4c6ad08  fix condition check
4c6ad08 is described below

commit 4c6ad088237c3f3b13b541bb7a5fcf17351591ad
Author: ms <ms@taler.net>
AuthorDate: Tue May 25 22:51:33 2021 +0200

    fix condition check
---
 bin/taler-deployment-config-instances | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/taler-deployment-config-instances 
b/bin/taler-deployment-config-instances
index c79eda5..40a17cb 100755
--- a/bin/taler-deployment-config-instances
+++ b/bin/taler-deployment-config-instances
@@ -15,6 +15,7 @@ from urllib.parse import urljoin
 from subprocess import Popen
 from time import sleep
 import psutil
+import getpass
 
 def expect_env(name):
     val = environ.get(name)
@@ -79,11 +80,12 @@ def ensure_default_instance():
     # Wait that merchant actually terminated.
     still_running = True
     while still_running:
+        still_running = False
         for proc in psutil.process_iter():
-            if proc.name() == "taler-merchant-httpd":
+            if proc.name() == "taler-merchant-httpd" and proc.username == 
getuser():
+                still_running = True
                 sleep(1)
                 break
-            still_running = False
     env_with_token = environ.copy()
     env_with_token["TALER_MERCHANT_TOKEN"] = TALER_ENV_FRONTENDS_APITOKEN
     merchant = Popen(["taler-merchant-httpd"], env=env_with_token)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]