3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-24 23:24:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

reactor: Add explicit finalize() method to clean up reactor state

Browse source 
The existence of a __del__() method prevents deallocation on python2
if there are circular references.  Replace the __del__() method with a
new finalize() call and arrange for it to be called when the main
reactor is released.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-16 12:15:19 -04:00
parent a3fa11ffd4
commit 760a0f8df5
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/klippy.py
View file

@ -48,10 +48,10 @@ Printer is shutdown
class Printer:
config_error = configfile.error
command_error = homing.CommandError
def __init__(self, bglogger, start_args):
def __init__(self, main_reactor, bglogger, start_args):
self.bglogger = bglogger
self.start_args = start_args
self.reactor = reactor.Reactor()
self.reactor = main_reactor
self.reactor.register_callback(self._connect)
self.state_message = message_startup
self.in_shutdown_state = False
@ -312,11 +312,13 @@ def main():
if bglogger is not None:
bglogger.clear_rollover_info()
bglogger.set_rollover_info('versions', versions)
printer = Printer(bglogger, start_args)
main_reactor = reactor.Reactor()
printer = Printer(main_reactor, bglogger, start_args)
res = printer.run()
if res in ['exit', 'error_exit']:
break
time.sleep(1.)
main_reactor.finalize()
logging.info("Restarting printer")
start_args['start_reason'] = res