diff --git a/dap/worker.py b/dap/worker.py index 84fa595..4b158df 100644 --- a/dap/worker.py +++ b/dap/worker.py @@ -13,7 +13,8 @@ from zmqsocks import ZMQSocketsWorker def main(): parser = argparse.ArgumentParser() - parser.add_argument("--backend_address", default=None) + parser.add_argument("--backend_host", required=True, default=None) + parser.add_argument("--backend_port", required=True, default=None) parser.add_argument("--accumulator_host", default="localhost") parser.add_argument("--accumulator_port", default=13002, type=int) parser.add_argument("--visualisation_host", default="localhost") @@ -23,11 +24,9 @@ def main(): clargs = parser.parse_args() - if not clargs.backend_address: - raise SystemExit("please provide a backend address") - work( - clargs.backend_address, + clargs.backend_host, + clargs.backend_port, clargs.accumulator_host, clargs.accumulator_port, clargs.visualisation_host, @@ -38,12 +37,12 @@ def main(): -def work(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port, fn_peakfinder_parameters, skip_frames_rate): +def work(backend_host, backend_port, accumulator_host, accumulator_port, visualisation_host, visualisation_port, fn_peakfinder_parameters, skip_frames_rate): bj_peakfinder_parameters = BufferedJSON(fn_peakfinder_parameters) jfdata = JFData() - zmq_socks = ZMQSocketsWorker(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port) + zmq_socks = ZMQSocketsWorker(backend_host, backend_port, accumulator_host, accumulator_port, visualisation_host, visualisation_port) aggregator = Aggregator() diff --git a/dap/zmqsocks.py b/dap/zmqsocks.py index 13ad67c..cd0d345 100644 --- a/dap/zmqsocks.py +++ b/dap/zmqsocks.py @@ -29,13 +29,13 @@ class ZMQSocketsAccumulator: class ZMQSocketsWorker: - def __init__(self, backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port): + def __init__(self, backend_host, backend_port, accumulator_host, accumulator_port, visualisation_host, visualisation_port): zmq_context = zmq.Context(io_threads=4) self.poller = poller = zmq.Poller() # receive from backend: self.backend_socket = backend_socket = zmq_context.socket(zmq.PULL) - backend_socket.connect(backend_address) + backend_socket.connect(f"tcp://{backend_host}:{backend_port}") poller.register(backend_socket, zmq.POLLIN)