diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2021-01-10 17:28:55 +0100 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2021-01-10 17:28:55 +0100 |
| commit | 37f62ac549ef7b5cce1cf624523350219d0b1d33 (patch) | |
| tree | 6bfc064e71305a63990209817c5191ddda59a499 | |
| parent | 1dc04540378cad90bc97f66fb4f0101d9d5b87e4 (diff) | |
| download | cyberschuessel-37f62ac549ef7b5cce1cf624523350219d0b1d33.tar.gz cyberschuessel-37f62ac549ef7b5cce1cf624523350219d0b1d33.zip | |
rename ws to ws_conn
| -rw-r--r-- | cyberschuessel/schuessel.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/cyberschuessel/schuessel.py b/cyberschuessel/schuessel.py index 0574d2f..0bed4ae 100644 --- a/cyberschuessel/schuessel.py +++ b/cyberschuessel/schuessel.py @@ -80,9 +80,9 @@ class Schuessel: """broadcast any json encodable object to all open websockets""" log.info('broadcasting %s to %d', msg, len(self.clients.values())) broken_sessions = [] - for session_id, ws in self.clients.items(): + for session_id, ws_conn in self.clients.items(): try: - await ws.send_json(msg) + await ws_conn.send_json(msg) except ConnectionResetError: broken_sessions.append(session_id) @@ -92,8 +92,8 @@ class Schuessel: async def close_all(self): """close all open websockets""" - for ws in list(self.clients.values()): - await ws.close() + for ws_conn in list(self.clients.values()): + await ws_conn.close() async def handler(self, request): """aiohttp handler @@ -103,28 +103,28 @@ class Schuessel: commands received from the socket. The server logic is implemented in this fnction.""" - ws = aiohttp.web.WebSocketResponse() - ws_ready = ws.can_prepare(request) + ws_conn = aiohttp.web.WebSocketResponse() + ws_ready = ws_conn.can_prepare(request) if not ws_ready.ok: return aiohttp_jinja2.render_template('index.html', request, {}) - await ws.prepare(request) + await ws_conn.prepare(request) session_id = self.session_counter self.session_counter += 1 - self.clients[session_id] = ws + self.clients[session_id] = ws_conn init_msg = {'action': 'init'} init_msg.update(self.schuessel_state()) log.info('send init action with %s to %d', init_msg, session_id) try: - await ws.send_json(init_msg) + await ws_conn.send_json(init_msg) except ConnectionResetError: del self.clients[session_id] - return ws + return ws_conn - async for msg in ws: + async for msg in ws_conn: log.info('received msg: %s from %d', msg, session_id) if msg.type == aiohttp.WSMsgType.TEXT: data = json.loads(msg.data) @@ -142,7 +142,7 @@ class Schuessel: log.info( 'send draw action with %s to %d', new_word, session_id) try: - await ws.send_json({ + await ws_conn.send_json({ 'action': 'draw', 'drawn_word': new_word, 'phase_change': phase_change, @@ -150,7 +150,7 @@ class Schuessel: }) except ConnectionResetError: del self.clients[session_id] - return ws + return ws_conn elif data['action'] == 'add': new_word = data['word'] @@ -170,10 +170,10 @@ class Schuessel: elif msg.type == aiohttp.WSMsgType.ERROR: del self.clients[session_id] print( - f'{session_id} connection closed with exception {ws.exception()}' + f'{session_id} connection closed with exception {ws_conn.exception()}' ) del self.clients[session_id] log.info('websocket connection %d closed', session_id) - return ws + return ws_conn |
