Reimplement emergency_shutdown()

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Take AG darks during the pre-observing task.
 * Add `retry_without_parking` option to the shutdown recipe.
 * Emit events for dome opening and closing and report them as notifications.
+* Modified `emergency_shutdown()` to close the dome if the shutdown recipe fails.
 
 ### 🔧 Fixed
 

src/gort/enums.py

@@ -150,6 +150,7 @@ class Event(UpperStrEnum):
     DOME_OPEN = auto()
     DOME_CLOSING = auto()
     DOME_CLOSED = auto()
+    EMERGENCY_SHUTDOWN = auto()
     UNCATEGORISED = auto()
 
 

src/gort/gort.py

@@ -29,6 +29,7 @@
     TypeVar,
 )
 
+from lvmopstools.retrier import Retrier
 from packaging.version import Version
 from rich import pretty, traceback
 from rich.logging import RichHandler
@@ -675,15 +676,30 @@ async def notify_event(self, event: Event, payload: dict[str, Any] = {}):
                 )
                 await notify_event(event)
 
-    async def emergency_close(self):
+    @Retrier(max_attempts=3, delay=3)
+    async def emergency_shutdown(self):
         """Parks and closes the telescopes."""
 
-        tasks = []
-        tasks.append(self.telescopes.park(disable=True))
-        tasks.append(self.enclosure.close(force=True, retry_without_parking=True))
+        self.log.warning("Emergency shutdown initiated.")
+        await self.notify_event(Event.EMERGENCY_SHUTDOWN)
+
+        try:
+            await self.shutdown(
+                park_telescopes=True,
+                disable_overwatcher=True,
+                retry_without_parking=True,
+                show_message=False,
+            )
+
+        except Exception as err:
+            self.log.error(f"Failed to shutdown: {err!r}")
+            self.log.warning("Trying to just close the dome.")
 
-        self.log.warning("Closing and parking telescopes.")
-        await asyncio.gather(*tasks)
+            await self.enclosure.close(
+                park_telescopes=True,
+                force=True,
+                retry_without_parking=True,
+            )
 
     async def observe(
         self,

src/gort/recipes/operations.py

@@ -144,6 +144,7 @@ async def recipe(
         additional_close: bool = False,
         disable_overwatcher: bool = False,
         retry_without_parking: bool = False,
+        show_message: bool = True,
     ):
         """Shutdown the telescope, closes the dome, etc.
 
@@ -164,6 +165,9 @@ async def recipe(
         retry_without_parking
             If the dome fails to park the telescopes before closing the dome, retries
             without parking the telescopes.
+        show_message
+            If :obj:`True`, shows a message with instructions on how to confirm
+            the dome is closed.
 
         """
 
@@ -196,7 +200,8 @@ async def recipe(
             await asyncio.sleep(5)
             await self.gort.enclosure.close(force=True)
 
-        self.gort.log.warning(SHUTDOWN_MESSAGE)
+        if show_message:
+            self.gort.log.warning(SHUTDOWN_MESSAGE)
 
 
 class CleanupRecipe(BaseRecipe):