oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev2099, Keep tor client running until update finished

Browse source
This commit is contained in:
shortcutme 2017-06-06 00:05:43 +02:00
parent 1d06d30812
commit 742c2fe684
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

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

2
src/Ui/UiWebsocket.py
View file

@ -825,8 +825,6 @@ class UiWebsocket(object):
def actionServerUpdate(self, to): def actionServerUpdate(self, to):
self.cmd("updating") self.cmd("updating")
sys.modules["main"].update_after_shutdown = True 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() SiteManager.site_manager.save()
sys.modules["main"].file_server.stop() sys.modules["main"].file_server.stop()
sys.modules["main"].ui_server.stop() sys.modules["main"].ui_server.stop()

3
zeronet.py
View file

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