esavkin
/
thermostat
forked from M-Labs/thermostat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shield pending commands from cancellation

This commit is contained in:
atse 2023-08-02 14:43:50 +08:00
parent 39a78b92c4
commit 7149fb6d85
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pytec/pytec/aioclient.py
View File

@ -74,12 +74,16 @@ class Client:
chunk = await self._reader.readline() chunk = await self._reader.readline()
return chunk.decode('utf-8', errors='ignore') return chunk.decode('utf-8', errors='ignore')
async def _command(self, *command): async def _read_write(self, command):
async with self._command_lock:
self._writer.write(((" ".join(command)).strip() + "\n").encode('utf-8')) self._writer.write(((" ".join(command)).strip() + "\n").encode('utf-8'))
await self._writer.drain() await self._writer.drain()
line = await self._read_line() return await self._read_line()
async def _command(self, *command):
async with self._command_lock:
# protect the read-write process from being cancelled midway
line = await asyncio.shield(self._read_write(command))
response = json.loads(line) response = json.loads(line)
logging.debug(f"{command}: {response}") logging.debug(f"{command}: {response}")