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

shell_command: always log the result of a shell command 

Use the return code to help determine if the command successfully finished.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-12-29 07:53:00 -05:00
parent fad6bc4ad7
commit 34af0b4bfb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moonraker/plugins/shell_command.py
View File

@ -85,16 +85,20 @@ class ShellCommand:
if self.partial_output: if self.partial_output:
self.output_cb(self.partial_output) self.output_cb(self.partial_output)
self.partial_output = b"" self.partial_output = b""
if complete:
msg = f"Command ({self.name}) finished"
elif self.cancelled:
msg = f"Command ({self.name}) cancelled"
else:
msg = f"Command ({self.name}) timed out"
logging.info(msg)
self.io_loop.remove_handler(fd) self.io_loop.remove_handler(fd)
self.return_code = proc.returncode self.return_code = proc.returncode
return self.return_code == 0 and complete success = self.return_code == 0 and complete
if success:
msg = f"Command ({self.name}) successfully finished"
elif self.cancelled:
msg = f"Command ({self.name}) cancelled"
elif not complete:
msg = f"Command ({self.name}) timed out"
else:
msg = f"Command ({self.name}) exited with return code" \
f" {self.return_code}"
logging.info(msg)
return success
async def run_with_response(self, timeout=2.): async def run_with_response(self, timeout=2.):
result = [] result = []