From 33b992bcd9ec4b4f7896ba79d626ec563016005c Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 24 Jul 2018 16:42:12 +0200 Subject: lavalab-gen.py: use zmq_auth value The current script just check for zmq_auth presence and does not check if it is set to false. this patch fix that! --- lavalab-gen.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lavalab-gen.py b/lavalab-gen.py index 4c10109..4c77c2b 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -150,7 +150,7 @@ def main(): fsettings.close() master_use_zmq_auth = False if "zmq_auth" in worker: - master_use_zmq_auth = True + master_use_zmq_auth = worker["zmq_auth"] if master_use_zmq_auth: if "zmq_auth_key" in worker: shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/" % workerdir) @@ -285,6 +285,8 @@ def main(): if fuser["name"] == remote_user: remote_token = fuser["token"] if "zmq_auth" in fm: + master_use_zmq_auth = fm["zmq_auth"] + if master_use_zmq_auth: if "zmq_auth_key" in fm: shutil.copy(fm["zmq_auth_key"], "%s/zmq_auth/" % workerdir) if "zmq_auth_key" in worker: -- cgit 1.2.3-korg