Skip to content

Commit 371ac4d

Browse files
committed
Directly pass configuration file from Murfey security configuration to workflows transport object rather than relying on the Zocalo configuration
1 parent acd0ca7 commit 371ac4d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/murfey/server/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ def run():
283283
LogFilter.install()
284284

285285
zc.add_command_line_options(parser)
286-
workflows.transport.add_command_line_options(parser, transport_argument=True)
286+
287+
security_config = get_security_config()
288+
workflows.transport.load_configuration_file(security_config.rabbitmq_credentials)
287289

288290
args = parser.parse_args()
289291

@@ -296,7 +298,6 @@ def run():
296298
# Set up logging now that the desired verbosity is known
297299
_set_up_logging(quiet=args.quiet, verbosity=args.verbose)
298300

299-
security_config = get_security_config()
300301
if not args.temporary and _transport_object:
301302
_transport_object.feedback_queue = security_config.feedback_queue
302303
rabbit_thread = Thread(

src/murfey/util/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def from_file(config_file_path: Path, instrument: str = "") -> Dict[str, Machine
8282

8383

8484
class Security(BaseModel):
85+
rabbitmq_credentials: str
8586
murfey_db_credentials: str
8687
crypto_key: str
8788
auth_key: str = ""

0 commit comments

Comments
 (0)