From 4d3215242756000a887baf90be74ba6ff081a49f Mon Sep 17 00:00:00 2001 From: jaknapper Date: Thu, 7 Aug 2025 18:10:02 +0100 Subject: [PATCH] Custom Memory error changed to generic sigkill --- src/openflexure_microscope_server/stitching.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/openflexure_microscope_server/stitching.py b/src/openflexure_microscope_server/stitching.py index 6d74a4a8..e7ba5730 100644 --- a/src/openflexure_microscope_server/stitching.py +++ b/src/openflexure_microscope_server/stitching.py @@ -24,8 +24,8 @@ DEFAULT_OVERLAP = 0.1 DEFAULT_RESIZE = 0.5 -class SubprocessOOMKilledError(MemoryError): - """Exception called when stitch is killed by Linux out of memory.""" +class SigkillError(ChildProcessError): + """Exception called when stitch is killed by Sigkill.""" class StitcherValidationError(RuntimeError): @@ -295,8 +295,9 @@ class FinalStitcher(BaseStitcher): if process.poll() == 0: self.logger.info("Stitching complete") elif process.poll() == -9: - raise SubprocessOOMKilledError( - "Stitching was killed due to insufficient memory." + raise SigkillError( + "Stitching was killed by an external process. This is " + "most likely due to running out of memory." ) else: raise ChildProcessError(