Skip to content

Commit dca23bb

Browse files
d-j-hattontieneupin
authored andcommitted
Move feedback queue name to security config as there will only be one per server instance
1 parent a27765d commit dca23bb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/murfey/server/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ def run():
320320
# Set up logging now that the desired verbosity is known
321321
_set_up_logging(quiet=args.quiet, verbosity=args.verbose)
322322

323-
machine_config = get_machine_config()
323+
security_config = get_security_config()
324324
if not args.temporary and _transport_object:
325-
_transport_object.feedback_queue = machine_config.feedback_queue
325+
_transport_object.feedback_queue = security_config.feedback_queue
326326
rabbit_thread = Thread(
327327
target=feedback_listen,
328328
daemon=True,

src/murfey/util/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class MachineConfig(BaseModel):
2929
gain_reference_directory: Optional[Path] = None
3030
processed_directory_name: str = "processed"
3131
gain_directory_name: str = "processing"
32-
feedback_queue: str = "murfey_feedback"
3332
node_creator_queue: str = "node_creator"
3433
superres: bool = False
3534
camera: str = "FALCON"
@@ -88,6 +87,7 @@ class Security(BaseModel):
8887
session_token_timeout: Optional[int] = None
8988
auth_type: Literal["password", "cookie"] = "password"
9089
cookie_key: str = ""
90+
feedback_queue: str = "murfey_feedback"
9191

9292

9393
def security_from_file(config_file_path: Path) -> Security:

0 commit comments

Comments
 (0)