From 5d095125d3d1fc64c39e13027008e48a523a89a9 Mon Sep 17 00:00:00 2001
From: Arksine <arksine.code@gmail.com>
Date: Sat, 6 Mar 2021 19:25:14 -0500
Subject: [PATCH] shell_command: add "log_complete" argument to run methods

This brings consistency to the "run" methods.  It also removes potential confusion between the previous "quiet" argument and the "verbose" argument in "run()".

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/plugins/proc_stats.py    |  2 +-
 moonraker/plugins/shell_command.py | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/moonraker/plugins/proc_stats.py b/moonraker/plugins/proc_stats.py
index 4845efb..edaecba 100644
--- a/moonraker/plugins/proc_stats.py
+++ b/moonraker/plugins/proc_stats.py
@@ -103,7 +103,7 @@ class ProcStats:
     async def _check_throttled_state(self):
         try:
             resp = await self.vcgencmd.run_with_response(
-                timeout=.5, quiet=True)
+                timeout=.5, log_complete=False)
             ts = int(resp.strip().split("=")[-1], 16)
         except Exception:
             return {'bits': 0, 'flags': ["?"]}
diff --git a/moonraker/plugins/shell_command.py b/moonraker/plugins/shell_command.py
index d00bee5..e911602 100644
--- a/moonraker/plugins/shell_command.py
+++ b/moonraker/plugins/shell_command.py
@@ -102,7 +102,7 @@ class ShellCommand:
     def get_return_code(self):
         return self.return_code
 
-    async def run(self, timeout=2., verbose=True):
+    async def run(self, timeout=2., verbose=True, log_complete=True):
         self.return_code = self.proc = None
         self.cancelled = False
         if not timeout:
@@ -124,9 +124,10 @@ class ShellCommand:
             await self.proc.cancel()
         else:
             complete = not self.cancelled
-        return self._check_proc_success(complete)
+        return self._check_proc_success(complete, log_complete)
 
-    async def run_with_response(self, timeout=2., retries=1, quiet=False):
+    async def run_with_response(self, timeout=2., retries=1,
+                                log_complete=True):
         self.return_code = self.proc = None
         self.cancelled = False
         while retries > 0:
@@ -143,7 +144,7 @@ class ShellCommand:
                     complete = not self.cancelled
                     if self.log_stderr and stderr:
                         logging.info(f"{self.command[0]}: {stderr.decode()}")
-                if self._check_proc_success(complete, quiet):
+                if self._check_proc_success(complete, log_complete):
                     return stdout.decode().rstrip("\n")
                 elif stdout:
                     logging.debug(
@@ -175,7 +176,7 @@ class ShellCommand:
             return False
         return True
 
-    def _check_proc_success(self, complete, quiet=False):
+    def _check_proc_success(self, complete, log_complete):
         self.return_code = self.proc.returncode
         success = self.return_code == 0 and complete
         if success:
@@ -187,7 +188,7 @@ class ShellCommand:
         else:
             msg = f"Command ({self.name}) exited with return code" \
                 f" {self.return_code}"
-        if not quiet:
+        if log_complete:
             logging.info(msg)
         return success