Catch timeout errors when closing camera stream (ca051243) · Commits · OpenFlexure / openflexure-microscope-server

openflexure_microscope/microscope.py

+12 −6

Original line number	Diff line number	Diff line
		@@ -71,9 +71,15 @@ class Microscope:
		"""Shut down the microscope hardware."""
		logging.info("Closing {}".format(self))
		if self.camera:
		try:
		self.camera.close()
		except TimeoutError as e:
		logging.error(e)
		if self.stage:
		try:
		self.stage.close()
		except TimeoutError as e:
		logging.error(e)
		self.captures.close()
		logging.info("Closed {}".format(self))

		@@ -291,7 +297,7 @@ class Microscope:
		fmt: str = "jpeg",
		annotations: dict = None,
		tags: list = None,
		metadata: dict = None
		metadata: dict = None,
		):
		if not annotations:
		annotations = {}
		@@ -312,7 +318,7 @@ class Microscope:
		use_video_port=use_video_port,
		resize=resize,
		bayer=bayer,
		fmt=fmt
		fmt=fmt,
		)

		# Inject system metadata