Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Dont use fstring in loggers #5

Merged
merged 1 commit into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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()
Expand Down
14 changes: 7 additions & 7 deletions sockit/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]:
Expand All @@ -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:
Expand All @@ -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()
4 changes: 2 additions & 2 deletions sockit/websockets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
from typing import NamedTuple, Optional

log = logging.getLogger(__name__)
LOGGER = logging.getLogger(__name__)


class WebsocketHeader(ctypes.Union):
Expand Down Expand Up @@ -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()
Expand Down