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

Dont check site files on wakeup

Browse source
This commit is contained in:
HelloZeroNet 2016-03-18 20:03:19 +01:00
parent ef699b2f91
commit f27e58395b
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/File/FileServer.py
View file

@ -155,10 +155,10 @@ class FileServer(ConnectionServer):
self.port_opened = True self.port_opened = True
# Check site file integrity # Check site file integrity
def checkSite(self, site): def checkSite(self, site, check_files=True):
if site.settings["serving"]: if site.settings["serving"]:
site.announce(mode="startup") # Announce site to tracker site.announce(mode="startup") # Announce site to tracker
site.update() # Update site's content.json and download changed files site.update(check_files=check_files) # Update site's content.json and download changed files
site.sendMyHashfield() site.sendMyHashfield()
site.updateHashfield() site.updateHashfield()
if len(site.peers) > 5: # Keep active connections if site having 5 or more peers if len(site.peers) > 5: # Keep active connections if site having 5 or more peers
@ -166,20 +166,22 @@ class FileServer(ConnectionServer):
# Check sites integrity # Check sites integrity
def checkSites(self): def checkSites(self):
def checkSites(self, check_files=True):
sites_checking = False
if self.port_opened is None: # Test and open port if not tested yet if self.port_opened is None: # Test and open port if not tested yet
if len(self.sites) <= 2: # Faster announce on first startup if len(self.sites) <= 2: # Don't wait port opening on first startup
sites_checking = True
for address, site in self.sites.items(): for address, site in self.sites.items():
gevent.spawn(self.checkSite, site) gevent.spawn(self.checkSite, site, check_files)
self.openport()
if not self.port_opened: self.openport()
self.tor_manager.startOnions() self.tor_manager.startOnions()
if not sites_checking:
self.log.debug("Checking sites integrity..") self.log.debug("Checking sites integrity..")
for address, site in self.sites.items(): # Check sites integrity for address, site in self.sites.items(): # Check sites integrity
gevent.spawn(self.checkSite, site) # Check in new thread gevent.spawn(self.checkSite, site, check_files) # Check in new thread
time.sleep(2) # Prevent too quick request time.sleep(2) # Prevent too quick request
site = None
def trackersFileReloader(self): def trackersFileReloader(self):
while 1: while 1:
@ -238,7 +240,7 @@ class FileServer(ConnectionServer):
(last_time, time.time(), time.time() - last_time) (last_time, time.time(), time.time() - last_time)
) )
self.port_opened = None # Check if we still has the open port on router self.port_opened = None # Check if we still has the open port on router
self.checkSites() self.checkSites(check_files=False)
last_time = time.time() last_time = time.time()
# Bind and start serving sites # Bind and start serving sites