Skip to content

Add logging for foil hole registration debugging #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-j-hatton merged 3 commits into from
Jan 13, 2025
Merged

Add logging for foil hole registration debugging #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c55dc22
Add warning log for when foil hole registration fails
d-j-hatton Jan 13, 2025
9c58523
Add warning log for when SPA preprocessing request can't find the foi…
d-j-hatton Jan 13, 2025
876da03
Guard against log injection
d-j-hatton Jan 13, 2025
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
5 changes: 4 additions & 1 deletion src/murfey/client/contexts/spa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,11 @@
foil_hole: Optional[int] = self._position_analysis(
transferred_file, environment, source, machine_config
)
except Exception:
except Exception as e:

Check warning on line 788 in src/murfey/client/contexts/spa.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/contexts/spa.py#L788 

Added line #L788 was not covered by tests
# try to continue if position information gathering fails so that movie is processed anyway
logger.warning(

Check warning on line 790 in src/murfey/client/contexts/spa.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/contexts/spa.py#L790 

Added line #L790 was not covered by tests
f"Unable to register foil hole for {str(file_transferred_to)}. Exception: {str(e)}"
)
foil_hole = None

preproc_url = f"{str(environment.url.geturl())}/visits/{environment.visit}/{environment.murfey_session}/spa_preprocess"
Expand Down
6 changes: 5 additions & 1 deletion src/murfey/server/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,11 @@
.one()[0]
.id
)
except Exception:
except Exception as e:
log.warning(

Check warning on line 1139 in src/murfey/server/api/__init__.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/server/api/__init__.py#L1138-L1139 

Added lines #L1138 - L1139 were not covered by tests
f"Foil hole ID not found for foil hole {sanitise(str(proc_file.foil_hole_id))}: {e}",
exc_info=True,
)
foil_hole_id = None
if proc_params:

Expand Down
Loading