Skip to content

Commit 6bf9892

Browse files
committed
Import sequence matters
1 parent f96c196 commit 6bf9892

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

src/murfey/cli/repost_failed_calls.py

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@
1010
from sqlmodel import Session, create_engine
1111
from workflows.transport.pika_transport import PikaTransport
1212

13-
import murfey.server.api.auth
14-
import murfey.server.api.bootstrap
15-
import murfey.server.api.clem
16-
import murfey.server.api.display
17-
import murfey.server.api.file_io_frontend
18-
import murfey.server.api.file_io_instrument
19-
import murfey.server.api.hub
20-
import murfey.server.api.instrument
21-
import murfey.server.api.mag_table
22-
import murfey.server.api.processing_parameters
23-
import murfey.server.api.prometheus
24-
import murfey.server.api.session_control
25-
import murfey.server.api.session_info
26-
import murfey.server.api.websocket
27-
import murfey.server.api.workflow
2813
from murfey.server.murfey_db import url
2914
from murfey.server.run import _set_up_transport
3015
from murfey.util.config import security_from_file
@@ -118,6 +103,23 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
118103
continue
119104

120105
try:
106+
# These imports need to happen after transport object is configured
107+
import murfey.server.api.auth
108+
import murfey.server.api.bootstrap
109+
import murfey.server.api.clem
110+
import murfey.server.api.display
111+
import murfey.server.api.file_io_frontend
112+
import murfey.server.api.file_io_instrument
113+
import murfey.server.api.hub
114+
import murfey.server.api.instrument
115+
import murfey.server.api.mag_table
116+
import murfey.server.api.processing_parameters
117+
import murfey.server.api.prometheus
118+
import murfey.server.api.session_control
119+
import murfey.server.api.session_info
120+
import murfey.server.api.websocket
121+
import murfey.server.api.workflow
122+
121123
function_to_call = getattr(
122124
getattr(murfey.server.api, router_base), function_name
123125
)
@@ -179,11 +181,17 @@ def run():
179181
)
180182
args = parser.parse_args()
181183

182-
# Read the security config file and configure the transport
184+
# Read the security config file
183185
security_config = security_from_file(args.config)
186+
187+
# Configure the transport
184188
PikaTransport().load_configuration_file(security_config.rabbitmq_credentials)
185189
_set_up_transport("PikaTransport")
186-
murfey.server._transport_object.feedback_queue = security_config.feedback_queue
190+
191+
# Now import transport object which was set up in the above step
192+
from murfey.server import _transport_object
193+
194+
_transport_object.feedback_queue = security_config.feedback_queue
187195

188196
# Purge the queue and repost/reinject any messages found
189197
dlq_dump_path = Path(args.dir)

0 commit comments

Comments
 (0)