Browse Source

Rev2099, Keep tor client running until update finished

shortcutme 6 years ago
parent
commit
742c2fe684
3 changed files with 4 additions and 3 deletions
  1. 1 1
      src/Config.py
  2. 0 2
      src/Ui/UiWebsocket.py
  3. 3 0
      zeronet.py

+ 1 - 1
src/Config.py

@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.5"
-        self.rev = 2098
+        self.rev = 2099
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"

+ 0 - 2
src/Ui/UiWebsocket.py

@@ -825,8 +825,6 @@ class UiWebsocket(object):
     def actionServerUpdate(self, to):
         self.cmd("updating")
         sys.modules["main"].update_after_shutdown = True
-        if sys.modules["main"].file_server.tor_manager.tor_process:
-            sys.modules["main"].file_server.tor_manager.stopTor()
         SiteManager.site_manager.save()
         sys.modules["main"].file_server.stop()
         sys.modules["main"].ui_server.stop()

+ 3 - 0
zeronet.py

@@ -19,6 +19,7 @@ def main():
         if main.update_after_shutdown:  # Updater
             import gc
             import update
+            import atexit
             # Try cleanup openssl
             try:
                 if "lib.opensslVerify" in sys.modules:
@@ -48,6 +49,8 @@ def main():
                 handler.close()
                 logger.removeHandler(handler)
 
+            atexit._run_exitfuncs()
+
     except Exception, err:  # Prevent closing
         import traceback
         try: