chore: fixing logging

Signed-off-by: Caleb Siebach <caleb@indicio.tech>

Author: whyriod

socketdock/api.py

@@ -43,8 +43,8 @@ async def status_handler(request: Request):
 @api.post("/socket/<connectionid>/send")
 async def socket_send(request: Request, connectionid: str):
     """Send a message to a connected socket."""
-    LOGGER.info("Inbound message for %s", connectionid)
-    LOGGER.debug("Existing connections: %s", active_connections.keys())
+    LOGGER.info(f"Inbound message for {connectionid}")
+    LOGGER.debug(f"Existing connections: {active_connections.keys()}")
 
     if connectionid not in active_connections:
         return text("FAIL", status=500)
@@ -60,8 +60,8 @@ async def socket_send(request: Request, connectionid: str):
 @api.post("/socket/<connectionid>/disconnect")
 async def socket_disconnect(request: Request, connectionid: str):
     """Disconnect a socket."""
-    LOGGER.info("Disconnect %s", connectionid)
-    LOGGER.debug("Existing connections: %s", active_connections.keys())
+    LOGGER.info(f"Disconnect {connectionid}")
+    LOGGER.debug(f"Existing connections: {active_connections.keys()}")
 
     if connectionid not in active_connections:
         return text("FAIL", status=500)
@@ -83,9 +83,9 @@ async def socket_handler(request: Request, websocket: Websocket):
         socket_id = websocket.ws_proto.id.hex
         active_connections[socket_id] = websocket
         lifetime_connections += 1
-        LOGGER.debug("Existing connections: %s", active_connections.keys())
-        LOGGER.debug("Added connection: %s", socket_id)
-        LOGGER.debug("Request headers: %s", dict(request.headers.items()))
+        LOGGER.debug(f"Existing connections: {active_connections.keys()}")
+        LOGGER.debug(f"Added connection: {socket_id}")
+        LOGGER.debug(f"Request headers: {dict(request.headers.items())}")
 
         await backend.socket_connected(
             connection_id=socket_id,
@@ -105,5 +105,5 @@ async def socket_handler(request: Request, websocket: Websocket):
         # unregister user
         if socket_id:
             del active_connections[socket_id]
-            LOGGER.info("Removed connection: %s", socket_id)
+            LOGGER.info(f"Removed connection: {socket_id}")
             await backend.socket_disconnected(socket_id)

socketdock/httpbackend.py

@@ -58,13 +58,13 @@ async def socket_connected(
 
         if self._connect_uri:
             async with aiohttp.ClientSession() as session:
-                LOGGER.info("Posting message %s to %s", http_body, self._connect_uri)
+                LOGGER.info(f"Posting message {http_body} to { self._connect_uri}")
                 async with session.post(self._connect_uri, json=http_body) as resp:
                     response = await resp.text()
                     if resp.status != 200:
-                        LOGGER.error("Error posting message: %s", response)
+                        LOGGER.error(f"Error posting message: {response}")
                     else:
-                        LOGGER.debug("Response: %s", response)
+                        LOGGER.debug(f"Response: {response}")
 
     async def inbound_socket_message(
         self,
@@ -81,25 +81,25 @@ async def inbound_socket_message(
         }
 
         async with aiohttp.ClientSession() as session:
-            LOGGER.info("Posting message %s to %s", http_body, self._message_uri)
+            LOGGER.info(f"Posting message {http_body} to {self._message_uri}")
             async with session.post(self._message_uri, json=http_body) as resp:
                 response = await resp.text()
                 if resp.status != 200:
-                    LOGGER.error("Error posting message: %s", response)
+                    LOGGER.error(f"Error posting message: {response}")
                 else:
-                    LOGGER.debug("Response: %s", response)
+                    LOGGER.debug(f"Response: {response}")
 
     async def socket_disconnected(self, connection_id: str):
         """Handle socket disconnected."""
         async with aiohttp.ClientSession() as session:
             LOGGER.info(
-                "Notifying of disconnect: %s %s", self._disconnect_uri, connection_id
+                f"Notifying of disconnect: {self._disconnect_uri} {connection_id}"
             )
             async with session.post(
                 self._disconnect_uri, json={"connection_id": connection_id}
             ) as resp:
                 response = await resp.text()
                 if resp.status != 200:
-                    LOGGER.error("Error posting to disconnect uri: %s", response)
+                    LOGGER.error(f"Error posting to disconnect uri: {response}")
                 else:
-                    LOGGER.debug("Response: %s", response)
+                    LOGGER.debug(f"Response: {response}")

socketdock/loadlogger.py

@@ -36,7 +36,7 @@ def load_resource(path: str, encoding: Optional[str] = None):
                 return io.TextIOWrapper(bstream, encoding=encoding)
             return bstream
     except IOError:
-        LOGGER.warning("Resource not found: %s", path)
+        LOGGER.warning(f"Resource not found: {path}")
         return None
 
 

socketdock/testbackend.py

@@ -25,26 +25,26 @@ async def socket_connected(
 
         This test backend doesn't care, but can be useful to clean up state.
         """
-        LOGGER.debug("Connected to test backend: %s", connection_id)
+        LOGGER.debug(f"Connected to test backend: {connection_id}")
 
     async def inbound_socket_message(
         self,
         connection_id: str,
         message: Union[str, bytes],
     ):
         """Receive socket message."""
-        LOGGER.debug("Recieved message [%s]: %s", connection_id, message)
+        LOGGER.debug(f"Recieved message [{connection_id}]: {message}")
         send_uri = f"{self.base_uri}/socket/{connection_id}/send"
         async with aiohttp.ClientSession() as session:
             async with session.post(send_uri, data="Hello yourself") as resp:
                 if not resp.ok:
                     raise Exception(f"Failed to post to: {send_uri}")
                 response = await resp.text()
-                LOGGER.debug("Response: %s", response)
+                LOGGER.debug(f"Response: {response}")
 
     async def socket_disconnected(self, connection_id: str):
         """Socket disconnected.
 
         This test backend doesn't care, but can be useful to clean up state.
         """
-        LOGGER.debug("Disconnected from test backend: %s", connection_id)
+        LOGGER.debug(f"Disconnected from test backend: {connection_id}")