From 9719f4b294b4d295ed62848c3a82a5271eb86139 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 13 Dec 2021 10:53:42 +0100 Subject: [PATCH] Change env name + fix python casting --- example/deploy_minio.py | 4 ++-- mknet | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/deploy_minio.py b/example/deploy_minio.py index 4488974..431b983 100755 --- a/example/deploy_minio.py +++ b/example/deploy_minio.py @@ -19,7 +19,7 @@ def leader(): sock.bind(UNIX_SOCK) sock.listen() - n_serv = os.environ['SIZE'] + n_serv = int(os.environ['SERVER_COUNT']) fl = [ co for co, addr in [ sock.accept() for i in range(n_serv - 1) ]] identities = [ json.loads(co.makefile().readline()) for co in fl ] + [ { "ip": os.environ['IP'], "path": make_data() } ] @@ -52,7 +52,7 @@ def make_data(): return data_path def run_minio(identities): - cmd = f"minio server --console-address ':9001' --address [{os.environ['IP']}]:9000" + cmd = f"minio server --console-address ':9001' --address ':9000'" for ident in identities: cmd += f" http://[{ident['ip']}]:9000{ident['path']}" cmd += f" > {os.path.join(STORAGE_PATH, 'minio'+os.environ['ID']+'.log')} 2>&1" diff --git a/mknet b/mknet index 8eb276a..9081aeb 100755 --- a/mknet +++ b/mknet @@ -321,7 +321,7 @@ def runall(cmd): env["HOST"] = server.name env["IP"] = str(server.ip) env["ID"] = str(number) - env["SIZE"] = str(len(config['servers'])) + env["SERVER_COUNT"] = str(len(config['servers'])) name = f'testnet-{zone.name}-{server.name}' net.ns.run(name, cmd, env) number +=1 @@ -331,7 +331,7 @@ def runall(cmd): env["HOST"] = zone.name env["IP"] = str(zone.ip) env["ID"] = str(number) - env["SIZE"] = str(len(config['servers'])) + env["SERVER_COUNT"] = str(len(config['servers'])) name = f'testnet-{zone.name}-{zone.name}' net.ns.run(name, cmd, env) first = False