From fac932ac83bba1294bbd5a2ce1d8675615ad29aa Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sun, 10 Jan 2021 17:10:47 +0100 Subject: use logging lazy formatting instead of f-strings --- cyberschuessel/schuessel.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cyberschuessel/schuessel.py b/cyberschuessel/schuessel.py index 7bf0faa..580cb63 100644 --- a/cyberschuessel/schuessel.py +++ b/cyberschuessel/schuessel.py @@ -65,7 +65,7 @@ class Schuessel: return word, phase_change async def broadcast(self, msg): - log.info(f'broadcasting {msg} to {len(self.clients.values())}') + log.info('broadcasting %s to %d', msg, len(self.clients.values())) broken_sessions = [] for session_id, ws in self.clients.items(): try: @@ -74,7 +74,7 @@ class Schuessel: broken_sessions.append(session_id) for session_id in broken_sessions: - log.info(f'remove broken session_id {session_id}') + log.info('remove broken session_id %d', session_id) del self.clients[session_id] async def close_all(self): @@ -96,7 +96,7 @@ class Schuessel: init_msg = {'action': 'init'} init_msg.update(self.schuessel_state()) - log.info(f'send init action with {init_msg} to {session_id}') + log.info('send init action with %s to %d', init_msg, session_id) try: await ws.send_json(init_msg) except ConnectionResetError: @@ -104,7 +104,7 @@ class Schuessel: return ws async for msg in ws: - log.info(f'received msg: {msg} from {session_id}') + log.info('received msg: %s from %d', msg, session_id) if msg.type == aiohttp.WSMsgType.TEXT: data = json.loads(msg.data) @@ -119,7 +119,7 @@ class Schuessel: # Make sure to always send the 'draw' msg after the 'drawn' # msg the javascript part expects this behavior log.info( - f'send draw action with {new_word} to {session_id}') + 'send draw action with %s to %d', new_word, session_id) try: await ws.send_json({ 'action': 'draw', @@ -134,7 +134,7 @@ class Schuessel: elif data['action'] == 'add': new_word = data['word'] self.add(new_word) - log.info(f'words in schuessel {self.words}') + log.info('words in schuessel %s', self.words) await self.broadcast({'action': 'add'}) elif data['action'] == 'reset': @@ -145,7 +145,7 @@ class Schuessel: else: log.error( - f'unknown action received: {data} from {session_id}') + 'unknown action received: %s from %d', data, session_id) elif msg.type == aiohttp.WSMsgType.ERROR: del self.clients[session_id] print( @@ -153,6 +153,6 @@ class Schuessel: ) del self.clients[session_id] - log.info(f'websocket connection {session_id} closed') + log.info('websocket connection %d closed', session_id) return ws -- cgit v1.2.3