added support for domains
This commit is contained in:
parent
e8ade4014f
commit
984ecbab7b
|
@ -1,11 +1,13 @@
|
||||||
[common]
|
[common]
|
||||||
server = http://conductorserver:8080/api
|
server = http://nubis2.int.d4science.net:8080/api
|
||||||
|
#domain = comma separated list of task domains to be applied to all task types as fallback
|
||||||
|
|
||||||
[pyrest]
|
[pyrest]
|
||||||
threads = 3
|
threads = 3
|
||||||
pollrate = .1
|
pollrate = .1
|
||||||
|
#domain = comma separated list of task domains to be applied to pyrest task type
|
||||||
|
|
||||||
[pyexec]
|
[pyexec]
|
||||||
threads = 3
|
threads = 3
|
||||||
pollrate = .1
|
pollrate = .1
|
||||||
|
#domain = comma separated list of task domains to be applied to pyexec task type
|
||||||
|
|
|
@ -34,8 +34,14 @@ def main():
|
||||||
pollrate = cfg["pyexec"].getfloat("pollrate")
|
pollrate = cfg["pyexec"].getfloat("pollrate")
|
||||||
server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"])
|
server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"])
|
||||||
|
|
||||||
|
domain = cfg["pyexec"].get("domain")
|
||||||
|
if domain is None:
|
||||||
|
domain = cfg["common"].get("domain")
|
||||||
|
elif cfg["common"].get("domain") is not None:
|
||||||
|
domain = domain + "," + cfg["common"].get("domain")
|
||||||
|
|
||||||
cc = ConductorWorker(server, threads, pollrate, "pyexec")
|
cc = ConductorWorker(server, threads, pollrate, "pyexec")
|
||||||
cc.start('pyexec', pyexec, True)
|
cc.start('pyexec', pyexec, True, domain)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
|
@ -30,8 +30,14 @@ def main():
|
||||||
pollrate = cfg["pyrest"].getfloat("pollrate")
|
pollrate = cfg["pyrest"].getfloat("pollrate")
|
||||||
server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"])
|
server = os.environ.get('CONDUCTOR_SERVER', cfg["common"]["server"])
|
||||||
|
|
||||||
|
domain = cfg["pyrest"].get("domain")
|
||||||
|
if domain is None:
|
||||||
|
domain = cfg["common"].get("domain")
|
||||||
|
elif cfg["common"].get("domain") is not None:
|
||||||
|
domain = domain + "," + cfg["common"].get("domain")
|
||||||
|
|
||||||
cc = ConductorWorker(server, threads, pollrate, "pyrest")
|
cc = ConductorWorker(server, threads, pollrate, "pyrest")
|
||||||
cc.start('pyrest', pyrest, True)
|
cc.start('pyrest', pyrest, True, domain)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in New Issue