disconnect database if activate_coro fails

Author: David Erb

src/dls_servbase_lib/datafaces/aiohttp.py

@@ -45,7 +45,7 @@ def __init__(self, specification=None):
     # ----------------------------------------------------------------------------------------
     def callsign(self):
         """"""
-        return "%s %s" % ("Dataface.Aiohttp", BaseAiohttp.callsign(self))
+        return "%s %s" % ("Servbase.Dataface", BaseAiohttp.callsign(self))
 
     # ----------------------------------------------------------------------------------------
     def activate_process(self):
@@ -68,7 +68,7 @@ def activate_thread(self, loop):
         """
 
         try:
-            threading.current_thread().name = "dls_servbase_dataface"
+            threading.current_thread().name = "servbase_dataface"
 
             self.activate_thread_base(loop)
 
@@ -99,7 +99,16 @@ async def activate_coro(self):
             await self.activate_coro_base(route_tuples)
 
         except Exception:
-            raise RuntimeError(f"unable to start {callsign(self)} server coro")
+            # We managed to get a dataface alive?
+            if self.__actual_dls_servbase_dataface is not None:
+                # Need to disconnect it so outer asyncio loop will quit.
+                logger.debug(
+                    f"[THRDIEP] {callsign(self)} disconnecting after failure to activate coro"
+                )
+
+                await self.__actual_dls_servbase_dataface.disconnect()
+
+            raise RuntimeError(f"{callsign(self)}  was unable to activate_coro")
 
     # ----------------------------------------------------------------------------------------
     async def direct_shutdown(self):

src/dls_servbase_lib/datafaces/normsql.py

@@ -34,6 +34,9 @@ async def start(self):
     # ----------------------------------------------------------------------------------------
     async def disconnect(self):
         if self.__database is not None:
+            logger.debug(
+                "[THRDIEP] disconnecting from actual servbase dataface normsql implementation"
+            )
             await self.__database.disconnect()
             self.__database = None