From de363b57ce1f30964e202a08ca68a0252f97a140 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 26 May 2017 12:22:35 +0200 Subject: [PATCH] Rev2091, Port opening error should not prevent ZeroNet startup --- src/Config.py | 2 +- src/File/FileServer.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Config.py b/src/Config.py index 90181759..83398056 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.5.5" - self.rev = 2090 + self.rev = 2091 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/File/FileServer.py b/src/File/FileServer.py index 7caf4d47..835c3c48 100644 --- a/src/File/FileServer.py +++ b/src/File/FileServer.py @@ -72,9 +72,8 @@ class FileServer(ConnectionServer): self.log.info("Trying to open port using UpnpPunch...") try: UpnpPunch.ask_to_open_port(self.port, 'ZeroNet', retries=3, protos=["TCP"]) - except (UpnpPunch.UpnpError, UpnpPunch.IGDError, socket.error) as err: - self.log.error("UpnpPunch run error: %s" % - Debug.formatException(err)) + except Exception as err: + self.log.error("UpnpPunch run error: %s" % Debug.formatException(err)) return False if self.testOpenport(port)["result"] is True: