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

Small improvements in FileServer

Browse source
This commit is contained in:
Vadim Ushakov 2021-10-25 17:09:16 +07:00
parent 1a8d30146e
commit dff52d691a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/File/FileServer.py
View file

@ -280,6 +280,7 @@ class FileServer(ConnectionServer):
# Returns False if Internet is immediately available # Returns False if Internet is immediately available
# Returns True if we've spent some time waiting for Internet # Returns True if we've spent some time waiting for Internet
# Returns None if FileServer is stopping or the Offline mode is enabled # Returns None if FileServer is stopping or the Offline mode is enabled
@util.Noparallel()
def waitForInternetOnline(self): def waitForInternetOnline(self):
if self.isOfflineMode() or self.stopping: if self.isOfflineMode() or self.stopping:
return None return None
@ -294,6 +295,7 @@ class FileServer(ConnectionServer):
if self.isInternetOnline(): if self.isInternetOnline():
break break
if len(self.update_pool) == 0: if len(self.update_pool) == 0:
log.info("Internet connection seems to be broken. Running an update for a random site to check if we are able to connect to any peer.")
thread = self.thread_pool.spawn(self.updateRandomSite) thread = self.thread_pool.spawn(self.updateRandomSite)
thread.join() thread.join()
@ -314,7 +316,7 @@ class FileServer(ConnectionServer):
if not site: if not site:
return return
log.debug("Checking randomly chosen site: %s", site.address_short) log.info("Randomly chosen site: %s", site.address_short)
self.spawnUpdateSite(site).join() self.spawnUpdateSite(site).join()
@ -446,6 +448,7 @@ class FileServer(ConnectionServer):
while self.isActiveMode(): while self.isActiveMode():
site = None site = None
self.sleep(short_timeout) self.sleep(short_timeout)
self.waitForInternetOnline()
if not self.isActiveMode(): if not self.isActiveMode():
break break