[tor-commits] [arm/master] Close controller connection last

[atagar@xxxxxxxxxxxxxx]

commit a1cceb2d230fa5c4bd8a6ff1f6f38227e0648471
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sun Mar 15 15:16:51 2015 -0700

    Close controller connection last
    
    Closing wthe controller while panels are still trying to do work naturally
    causes a lot of noise (since their controller connection is swiped out from
    under them), and masks other issues.
    
    Might as well do this last.
---
 seth/starter.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/seth/starter.py b/seth/starter.py
index 2b98706..abb4eec 100644
--- a/seth/starter.py
+++ b/seth/starter.py
@@ -279,19 +279,16 @@ def _shutdown_daemons(controller):
   Stops and joins on worker threads.
   """
 
-  close_controller = threading.Thread(target = controller.close)
-  close_controller.setDaemon(True)
-  close_controller.start()
-
   halt_threads = [
     seth.controller.stop_controller(),
     seth.util.tracker.stop_trackers(),
-    close_controller,
   ]
 
   for thread in halt_threads:
     thread.join()
 
+  controller.close()
+
 
 if __name__ == '__main__':
   main()



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits