aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/klippy.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-04-03 12:13:06 -0400
committerKevin O'Connor <kevin@koconnor.net>2018-04-03 13:18:52 -0400
commitbb8926d67af485efd962fae5c464c3f214bfd8ae (patch)
treecb62496c20bb9c1969bfa80b176e15285ae7f02f /klippy/klippy.py
parenta301713361f7c2a1b397697b09dacab18ffdc05c (diff)
downloadkutter-bb8926d67af485efd962fae5c464c3f214bfd8ae.tar.gz
kutter-bb8926d67af485efd962fae5c464c3f214bfd8ae.tar.xz
kutter-bb8926d67af485efd962fae5c464c3f214bfd8ae.zip
klippy: Automatically clear rollover_info on each restart
Automatically clear the information printed at the start of each log file rollover on a klippy internal restart. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/klippy.py')
-rw-r--r--klippy/klippy.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 9a16d8f0..77ab3cc0 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -131,8 +131,6 @@ class Printer:
def __init__(self, input_fd, bglogger, start_args):
self.bglogger = bglogger
self.start_args = start_args
- if bglogger is not None:
- bglogger.set_rollover_info("config", None)
self.reactor = reactor.Reactor()
gc = gcode.GCodeParser(self, input_fd)
self.objects = collections.OrderedDict({'gcode': gc})
@@ -170,6 +168,7 @@ class Printer:
return [self.objects[module_name]] + objs
return objs
def set_rollover_info(self, name, info):
+ logging.info(info)
if self.bglogger is not None:
self.bglogger.set_rollover_info(name, info)
def _stats(self, eventtime, force_output=False):
@@ -355,16 +354,18 @@ def main():
logging.info("Starting Klippy...")
start_args['software_version'] = util.get_git_version()
if bglogger is not None:
- lines = ["Args: %s" % (sys.argv,),
- "Git version: %s" % (repr(start_args['software_version']),),
- "CPU: %s" % (util.get_cpu_info(),),
- "Python: %s" % (repr(sys.version),)]
- lines = "\n".join(lines)
- logging.info(lines)
- bglogger.set_rollover_info('versions', lines)
+ versions = "\n".join([
+ "Args: %s" % (sys.argv,),
+ "Git version: %s" % (repr(start_args['software_version']),),
+ "CPU: %s" % (util.get_cpu_info(),),
+ "Python: %s" % (repr(sys.version),)])
+ logging.info(versions)
# Start Printer() class
while 1:
+ if bglogger is not None:
+ bglogger.clear_rollover_info()
+ bglogger.set_rollover_info('versions', versions)
printer = Printer(input_fd, bglogger, start_args)
res = printer.run()
if res == 'exit':