diff --git a/main.py b/main.py index 3538895..863394c 100644 --- a/main.py +++ b/main.py @@ -5,7 +5,7 @@ from sockit.server import WebSocketServer logging.basicConfig(stream=sys.stdout, level=logging.INFO) -log = logging.getLogger(__name__) +LOGGER = logging.getLogger(__name__) class Settings: @@ -17,7 +17,7 @@ def main() -> None: loop = asyncio.get_event_loop() # Each client connection will create a new protocol instance coro = loop.create_server(WebSocketServer, Settings.HOST, Settings.PORT) - log.info("start server on {}:{}".format(Settings.HOST, Settings.PORT)) + LOGGER.info("start server on %s:%s", Settings.HOST, Settings.PORT) server = loop.run_until_complete(coro) try: loop.run_forever() diff --git a/sockit/server.py b/sockit/server.py index e627b59..d48c1f5 100644 --- a/sockit/server.py +++ b/sockit/server.py @@ -10,7 +10,7 @@ from sockit.utils import HTTPRequest from sockit.websockets import WebsocketRequest, WebsocketResponse -log = logging.getLogger(__name__) +LOGGER = logging.getLogger(__name__) _minimal_http_version = "1.1" @@ -50,7 +50,7 @@ def __init__(self) -> None: def connection_made(self, transport: Transport) -> None: # type: ignore self.transport = transport - log.info(f"Connection from {self.peername}") + LOGGER.info("Connection from %s", self.peername) @property def peername(self) -> Optional[str]: @@ -72,11 +72,11 @@ def data_received(self, data: bytes) -> None: return self.finalise_handshake(data) request = WebsocketRequest(data) payload = request.payload() - log.info(f"Received data: {payload.decode()}") + LOGGER.info("Received data: %s", payload.decode()) def connection_lost(self, exc: Optional[Exception]) -> None: - log.info(f"Connection from {self.peername} close") - log.warning(f"exc={exc}") + LOGGER.info("Connection from %s close", self.peername) + LOGGER.warning("exc=%s", exc) if self._future: self._future.cancel() if self.transport: @@ -89,6 +89,6 @@ async def writer(self, transport: Transport) -> None: response = WebsocketResponse(message).response() transport.write(response) await asyncio.sleep(5) - except Exception as exc: - log.error(exc) + except Exception: + LOGGER.exception("Error, closing") transport.close() diff --git a/sockit/websockets.py b/sockit/websockets.py index babadb8..e575a16 100644 --- a/sockit/websockets.py +++ b/sockit/websockets.py @@ -2,7 +2,7 @@ import logging from typing import NamedTuple, Optional -log = logging.getLogger(__name__) +LOGGER = logging.getLogger(__name__) class WebsocketHeader(ctypes.Union): @@ -38,7 +38,7 @@ def __str__(self) -> str: class WebsocketRequest: def __init__(self, data: bytes) -> None: self.header = WebsocketHeader(data) - log.info(f"Received request: {self.header}") + LOGGER.info("Received request: %s", self.header) self.data = data self.start_byte = 2 self.length = self._get_length()