sf-daq/dap
0
1
Fork 2
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

make arguments consistently host and port; mark backend host/port as required instead of manual check

Browse Source
This commit is contained in:
augustin_s
2025-10-15 13:41:27 +02:00
parent 6a6287755d
commit 7a310b9864
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dap/worker.py
View File

@@ -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()

4
dap/zmqsocks.py
View File

@@ -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)