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

Rev2091, Port opening error should not prevent ZeroNet startup

Browse source
This commit is contained in:
shortcutme 2017-05-26 12:22:35 +02:00
parent e291555e60
commit de363b57ce
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.5.5" self.version = "0.5.5"
self.rev = 2090 self.rev = 2091
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

5
src/File/FileServer.py
View file

@ -72,9 +72,8 @@ class FileServer(ConnectionServer):
self.log.info("Trying to open port using UpnpPunch...") self.log.info("Trying to open port using UpnpPunch...")
try: try:
UpnpPunch.ask_to_open_port(self.port, 'ZeroNet', retries=3, protos=["TCP"]) UpnpPunch.ask_to_open_port(self.port, 'ZeroNet', retries=3, protos=["TCP"])
except (UpnpPunch.UpnpError, UpnpPunch.IGDError, socket.error) as err: except Exception as err:
self.log.error("UpnpPunch run error: %s" % self.log.error("UpnpPunch run error: %s" % Debug.formatException(err))
Debug.formatException(err))
return False return False
if self.testOpenport(port)["result"] is True: if self.testOpenport(port)["result"] is True: