From 4a0fc68acf95cc5bb6cf20cea5679f277841fa39 Mon Sep 17 00:00:00 2001
From: David Erb <david.erb@diamond.ac.uk>
Date: Sat, 4 Feb 2023 06:39:14 +0000
Subject: [PATCH] fixes lint

---
 src/dls_servbase_api/aiohttp_client.py      | 4 ++--
 src/dls_servbase_lib/base_aiohttp.py        | 3 ++-
 src/dls_servbase_lib/cookies/dataface.py    | 3 +++
 src/dls_servbase_lib/databases/aiosqlite.py | 8 ++++----
 tests/conftest.py                           | 3 ---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/dls_servbase_api/aiohttp_client.py b/src/dls_servbase_api/aiohttp_client.py
index f7c77e9..d5fbe37 100644
--- a/src/dls_servbase_api/aiohttp_client.py
+++ b/src/dls_servbase_api/aiohttp_client.py
@@ -15,7 +15,7 @@
 
 # Exceptions.
 from dls_servbase_api.exceptions import (
-    ClientConnectorError as DlsBillyClientConnectorError,
+    ClientConnectorError as DlsServbaseClientConnectorError,
 )
 
 logger = logging.getLogger(__name__)
@@ -135,7 +135,7 @@ async def client_protocolj(self, request_object, cookies=None):
 
                     raise exception_class(exception_message)
         except aiohttp.ClientConnectorError as exception:
-            raise DlsBillyClientConnectorError(
+            raise DlsServbaseClientConnectorError(
                 explain(exception, f"connecting to {callsign(self)}")
             )
 
diff --git a/src/dls_servbase_lib/base_aiohttp.py b/src/dls_servbase_lib/base_aiohttp.py
index 2265e38..55db1a6 100644
--- a/src/dls_servbase_lib/base_aiohttp.py
+++ b/src/dls_servbase_lib/base_aiohttp.py
@@ -532,9 +532,10 @@ async def release_cookies(self, opaque):
         if self.__cookie_specification is None:
             return
 
-        # logger.debug("[COOKOFF] releaseing cookies")
+        logger.info("[RELCOOK] releasing cookies")
 
         for cookie in opaque.cookies.list():
+            logger.info("[RELCOOK] releasing cookie")
             await cookie.release()
 
     # ----------------------------------------------------------------------------------------
diff --git a/src/dls_servbase_lib/cookies/dataface.py b/src/dls_servbase_lib/cookies/dataface.py
index 9269344..6456d1e 100644
--- a/src/dls_servbase_lib/cookies/dataface.py
+++ b/src/dls_servbase_lib/cookies/dataface.py
@@ -86,6 +86,9 @@ async def release(self):
         Release cookie and free its connections and other resources.
         """
 
+        logger.info(
+            f"[RELCOOK] releasing client to cookie dataface {str(self.__dataface)}"
+        )
         if self.__dataface is not None:
             await self.__dataface.close_client_session()
             self.__dataface = None
diff --git a/src/dls_servbase_lib/databases/aiosqlite.py b/src/dls_servbase_lib/databases/aiosqlite.py
index f3979d7..0571d77 100644
--- a/src/dls_servbase_lib/databases/aiosqlite.py
+++ b/src/dls_servbase_lib/databases/aiosqlite.py
@@ -1,7 +1,7 @@
 import logging
 
 # Base class for the aiosqlite database object.
-from dls_normsql.aiosqlite import Aiosqlite as SqlinkyAiosqlite
+from dls_normsql.aiosqlite import Aiosqlite as NormsqlAiosqlite
 
 # Base class for our database definition.
 from dls_servbase_lib.databases.database_definition import DatabaseDefinition
@@ -10,7 +10,7 @@
 
 
 # ----------------------------------------------------------------------------------------
-class Aiosqlite(DatabaseDefinition, SqlinkyAiosqlite):
+class Aiosqlite(DatabaseDefinition, NormsqlAiosqlite):
     """
     Class with coroutines for creating and querying a sqlite database.
     We use dls-normsql to do the heavy lifting.
@@ -26,7 +26,7 @@ def __init__(self, specification):
         DatabaseDefinition.__init__(self)
 
         # Constructor for the database implementation.
-        SqlinkyAiosqlite.__init__(self, specification)
+        NormsqlAiosqlite.__init__(self, specification)
 
     # ----------------------------------------------------------------------------------------
     def reinstance(self):
@@ -44,7 +44,7 @@ async def add_table_definitions(self):
         """
 
         # Add tables common in all implementations.
-        await SqlinkyAiosqlite.add_table_definitions(self)
+        await NormsqlAiosqlite.add_table_definitions(self)
 
         # Add tables from our definition.
         await DatabaseDefinition.add_table_definitions(self)
diff --git a/tests/conftest.py b/tests/conftest.py
index d4def43..9cc3446 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -54,9 +54,6 @@ def logging_setup():
     # Registering signal handler.
     logging.getLogger("dls_utilpack.signal").setLevel("INFO")
 
-    # Set filter on the ispyb logger to ignore the annoying NOTICE.
-    logging.getLogger("ispyb").addFilter(_ispyb_logging_filter())
-
     # Cover the version.
     # logger.info("\n%s", (json.dumps(version_meta(), indent=4)))