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

Store site manager to file server

Browse source
This commit is contained in:
shortcutme 2018-02-08 18:11:45 +01:00
parent b56c985a63
commit ee6ab8e82a
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/File/FileServer.py
View file

@ -21,6 +21,10 @@ class FileServer(ConnectionServer):
def __init__(self, ip=config.fileserver_ip, port=config.fileserver_port):
ConnectionServer.__init__(self, ip, port, self.handleRequest)
self.site_manager = SiteManager.site_manager
self.log = logging.getLogger("FileServer")
if config.ip_external: # Ip external defined in arguments
self.port_opened = True
SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist
@ -101,7 +105,7 @@ class FileServer(ConnectionServer):
def testOpenportP2P(self, port=None):
self.log.info("Checking port %s using P2P..." % port)
site = SiteManager.site_manager.get(config.homepage)
site = self.site_manager.get(config.homepage)
peers = []
res = None
if not site: # First run, has no any peers
@ -334,9 +338,7 @@ class FileServer(ConnectionServer):
# Bind and start serving sites
def start(self, check_sites=True):
self.sites = SiteManager.site_manager.list()
self.log = logging.getLogger("FileServer")
self.sites = self.site_manager.list()
if config.debug:
# Auto reload FileRequest on change
from Debug import DebugReloader
@ -361,4 +363,5 @@ class FileServer(ConnectionServer):
self.log.info('Closed port via upnp.')
except (UpnpPunch.UpnpError, UpnpPunch.IGDError), err:
self.log.info("Failed at attempt to use upnp to close port: %s" % err)
ConnectionServer.stop(self)
return ConnectionServer.stop(self)