gcode: Change respond_info() to log by default

It makes sense to log most respond_info() content, so do that by
default.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-03-04 13:04:18 -05:00
parent d62a41b930
commit 1731fbbca4
9 changed files with 17 additions and 29 deletions

View file

@ -307,20 +307,21 @@ class GCodeParser:
os.write(self.fd, msg+"\n")
except os.error:
logging.exception("Write g-code response")
def respond_info(self, msg):
logging.debug(msg)
def respond_info(self, msg, log=True):
if log:
logging.info(msg)
lines = [l.strip() for l in msg.strip().split('\n')]
self.respond("// " + "\n// ".join(lines))
def respond_error(self, msg):
logging.warning(msg)
lines = msg.strip().split('\n')
if len(lines) > 1:
self.respond_info("\n".join(lines))
self.respond_info("\n".join(lines), log=False)
self.respond('!! %s' % (lines[0].strip(),))
if self.is_fileinput:
self.printer.request_exit('error_exit')
def _respond_state(self, state):
self.respond_info("Klipper state: %s" % (state,))
self.respond_info("Klipper state: %s" % (state,), log=False)
# Parameter parsing helpers
class sentinel: pass
def get_str(self, name, params, default=sentinel, parser=str,
@ -695,7 +696,7 @@ class GCodeParser:
self.request_restart('firmware_restart')
cmd_ECHO_when_not_ready = True
def cmd_ECHO(self, params):
self.respond_info(params['#original'])
self.respond_info(params['#original'], log=False)
cmd_STATUS_when_not_ready = True
cmd_STATUS_help = "Report the printer status"
def cmd_STATUS(self, params):
@ -714,4 +715,4 @@ class GCodeParser:
for cmd in sorted(self.gcode_handlers):
if cmd in self.gcode_help:
cmdhelp.append("%-10s: %s" % (cmd, self.gcode_help[cmd]))
self.respond_info("\n".join(cmdhelp))
self.respond_info("\n".join(cmdhelp), log=False)