child reaper code does not belong in server core (there, it interfere…

…s as it overrides the reaper_exit method)

git-svn-id: https://xpra.org/svn/Xpra/trunk@18580 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/server/mixins/child_command_server.py

@@ -73,6 +73,9 @@ def set_reaper_callback():
     def cleanup(self):
         if self.terminate_children and self._upgrading!=EXITING_CODE:
             self.terminate_children_processes()
+        def noop():
+            pass
+        self.reaper_exit = noop
         reaper_cleanup()
 
 

src/xpra/server/server_core.py

@@ -273,9 +273,6 @@ def setup(self, opts):
 
     ######################################################################
     # run / stop:
-    def reaper_exit(self):
-        self.clean_quit()
-
     def signal_quit(self, signum, _frame):
         sys.stdout.write("\n")
         sys.stdout.flush()
@@ -290,12 +287,6 @@ def clean_quit(self, upgrading=False):
         log("clean_quit(%s)", upgrading)
         self._upgrading = upgrading
         self._closing = True
-        #ensure the reaper doesn't call us again:
-        if self.child_reaper:
-            def noop():
-                pass
-            self.reaper_exit = noop
-            log("clean_quit: reaper_exit=%s", self.reaper_exit)
         self.cleanup()
         def quit_timer():
             log.debug("quit_timer()")