From 1cbb281f39fbc00d1e328ad5ae9832cbe83a0140 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Wed, 15 Jul 2020 09:34:49 +0200 Subject: [PATCH] generalized server IP configuration --- config.cfg | 2 +- pyexec.py | 4 +++- pyrest.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config.cfg b/config.cfg index a94719d..ff881bc 100644 --- a/config.cfg +++ b/config.cfg @@ -1,5 +1,5 @@ [common] -server = https://nubis1.int.d4science.net/api +server = http://conductorserver:8080/api [pyrest] threads = 5 diff --git a/pyexec.py b/pyexec.py index 62a554d..77d1e38 100644 --- a/pyexec.py +++ b/pyexec.py @@ -33,7 +33,9 @@ def main(): threads = cfg["pyexec"].getint("threads") pollrate = cfg["pyexec"].getfloat("pollrate") - cc = ConductorWorker(cfg["common"]["server"], threads, pollrate, "pyexec") + server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"]) + + cc = ConductorWorker(server, threads, pollrate, "pyexec") cc.start('pyexec', pyexec, True) if __name__ == '__main__': diff --git a/pyrest.py b/pyrest.py index a401f9d..aa124ec 100644 --- a/pyrest.py +++ b/pyrest.py @@ -25,7 +25,9 @@ def main(): threads = cfg["pyrest"].getint("threads") pollrate = cfg["pyrest"].getfloat("pollrate") - cc = ConductorWorker(cfg["common"]["server"], threads, pollrate, "pyrest") + server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"]) + + cc = ConductorWorker(server, threads, pollrate, "pyrest") cc.start('pyrest', pyrest, True) if __name__ == '__main__':