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

Rev3502, Start fileserver to new greenlet to fix siteDownload and siteAnnounce CLI action

Browse source
This commit is contained in:
shortcutme 2018-07-02 15:42:16 +02:00
parent d5b31a5545
commit ec05e6864a
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 3 additions and 4 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.6.3" self.version = "0.6.3"
self.rev = 3501 self.rev = 3502
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

5
src/main.py
View file

@ -325,7 +325,7 @@ class Actions(object):
global file_server global file_server
from File import FileServer from File import FileServer
file_server = FileServer("127.0.0.1", 1234) 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 = Site(address)
@ -342,7 +342,6 @@ class Actions(object):
print "Downloading..." print "Downloading..."
site.downloadContent("content.json", check_modifications=True) site.downloadContent("content.json", check_modifications=True)
print on_completed.get()
print "Downloaded in %.3fs" % (time.time()-s) print "Downloaded in %.3fs" % (time.time()-s)
@ -362,7 +361,7 @@ class Actions(object):
global file_server global file_server
from File import FileServer from File import FileServer
file_server = FileServer("127.0.0.1", 1234) 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 = Site(address)
site.announce() site.announce()