From ec05e6864ab918794df12ea140f1da7c48e1d1fe Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 2 Jul 2018 15:42:16 +0200 Subject: [PATCH] Rev3502, Start fileserver to new greenlet to fix siteDownload and siteAnnounce CLI action --- src/Config.py | 2 +- src/main.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Config.py b/src/Config.py index d417482f..1edbe25a 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.3" - self.rev = 3501 + self.rev = 3502 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/main.py b/src/main.py index 9334fc31..a424625e 100644 --- a/src/main.py +++ b/src/main.py @@ -325,7 +325,7 @@ class Actions(object): global file_server from File import FileServer file_server = FileServer("127.0.0.1", 1234) - file_server.start() + file_server_thread = gevent.spawn(file_server.start, check_sites=False) site = Site(address) @@ -342,7 +342,6 @@ class Actions(object): print "Downloading..." site.downloadContent("content.json", check_modifications=True) - print on_completed.get() print "Downloaded in %.3fs" % (time.time()-s) @@ -362,7 +361,7 @@ class Actions(object): global file_server from File import FileServer file_server = FileServer("127.0.0.1", 1234) - file_server.start() + file_server_thread = gevent.spawn(file_server.start, check_sites=False) site = Site(address) site.announce()