Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ uvicorn[standard]>=0.29.0
pyyaml>=6.0
requests>=2.31.0
python-dotenv>=1.0.0
# Mu2e DAQ service discovery (stdlib-only; from the sibling submodule).
mu2edaq-discovery
20 changes: 19 additions & 1 deletion server/mu2e-resource-manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,25 @@ def parse_args():
responder.start()
print(f"Discovery: UDP port {args.discovery_port} (broadcast)")

uvicorn.run(app, host=args.host, port=args.port)
# Mu2e DAQ service discovery (standard multicast protocol): advertise the
# HTTP port so the app appears in mu2edaq-discover scans and the control
# room browser. Separate from the resource manager's own UDP broadcast
# discovery above. Best-effort so a missing package never blocks startup.
mu2e_responder = None
try:
from mu2edaq_discovery import Responder
mu2e_responder = Responder(name="Resource Manager",
app="resource-manager",
port=args.port, scheme="http")
mu2e_responder.start()
except Exception as exc:
print(f"[Discovery] mu2edaq responder not started: {exc}")

try:
uvicorn.run(app, host=args.host, port=args.port)
finally:
if mu2e_responder is not None:
mu2e_responder.stop()
Comment on lines +236 to +254
else:
# When imported (e.g., by uvicorn directly), use defaults
rm = ResourceManager(
Expand Down