3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell_command: replace tornado lock with asyncio lock 

Also use asyncio's sleep method in place of tornado's wrapper around it.

Signed-off-by: Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-07-10 09:01:52 -04:00
parent 4430d564fe
commit 85d12da18d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/components/shell_command.py
View File

@ -10,8 +10,6 @@ import shlex
import logging import logging
import signal import signal
import asyncio import asyncio
from tornado import gen
from tornado.locks import Lock
from utils import ServerError from utils import ServerError
# Annotation imports # Annotation imports
@ -149,7 +147,7 @@ class ShellCommand:
self.proc: Optional[SCProcess] = None self.proc: Optional[SCProcess] = None
self.cancelled = False self.cancelled = False
self.return_code: Optional[int] = None self.return_code: Optional[int] = None
self.run_lock = Lock() self.run_lock = asyncio.Lock()
async def cancel(self, sig_idx: int = 1) -> None: async def cancel(self, sig_idx: int = 1) -> None:
self.cancelled = True self.cancelled = True
@ -236,14 +234,14 @@ class ShellCommand:
if self.cancelled and not timed_out: if self.cancelled and not timed_out:
break break
retries -= 1 retries -= 1
await gen.sleep(.5) await asyncio.sleep(.5)
self.factory.remove_running_command(self) self.factory.remove_running_command(self)
raise ShellCommandError( raise ShellCommandError(
f"Error running shell command: '{self.command}'", f"Error running shell command: '{self.command}'",
self.return_code, stdout, stderr) self.return_code, stdout, stderr)
async def _create_subprocess(self) -> bool: async def _create_subprocess(self) -> bool:
loop = asyncio.get_event_loop() loop = asyncio.get_running_loop()
def protocol_factory(): def protocol_factory():
return asyncio.subprocess.SubprocessStreamProtocol( return asyncio.subprocess.SubprocessStreamProtocol(