Skip to content

Commit 3de1b99

Browse files
committed
Added logs to keep track of workflow progress
1 parent 231f03f commit 3de1b99

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/murfey/server/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,6 +2291,10 @@ def feedback_callback(header: dict, message: dict) -> None:
22912291
_transport_object.transport.ack(header)
22922292
return None
22932293
elif message["register"] == "data_collection":
2294+
logger.debug(
2295+
f"Received message named 'data_collection' containing the following items:\n"
2296+
f"{', '.join([f'{key}: {value}' for key, value in message.items()])}"
2297+
)
22942298
murfey_session_id = message["session_id"]
22952299
ispyb_session_id = murfey.server.ispyb.get_session_id(
22962300
microscope=message["microscope"],
@@ -2309,7 +2313,9 @@ def feedback_callback(header: dict, message: dict) -> None:
23092313
# flush_data_collections(message["source"], murfey_db)
23102314
else:
23112315
logger.warning(
2312-
f"No data collection group ID was found for image directory {sanitise(message['image_directory'])} and source {sanitise(message['source'])}"
2316+
"No data collection group ID was found for image directory "
2317+
f"{sanitise(message['image_directory'])} and source "
2318+
f"{sanitise(message['source'])}"
23132319
)
23142320
if _transport_object:
23152321
_transport_object.transport.nack(header, requeue=True)

src/murfey/server/ispyb.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,17 @@ def get_session_id(
557557
visit_number: str,
558558
db: sqlalchemy.orm.Session | None,
559559
) -> int | None:
560+
561+
# Log received lookup parameters
562+
log.debug(
563+
"Looking up ISPyB BLSession ID using the following values:\n"
564+
f"microscope: {microscope}\n"
565+
f"proposal_code: {proposal_code}\n"
566+
f"proposal_number: {proposal_number}\n"
567+
f"visit_number: {visit_number}\n"
568+
)
569+
570+
# Lookup BLSession ID
560571
if db is None:
561572
return None
562573
query = (

0 commit comments

Comments
 (0)