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

Tor connect error and uPnP punch error are not critical

Browse source
This commit is contained in:
shortcutme 2018-02-10 15:33:54 +01:00
parent 13e0d9b306
commit 39568737dd
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/File/FileServer.py
View file

@ -80,7 +80,7 @@ class FileServer(ConnectionServer):
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 Exception as err: except Exception as err:
self.log.error("UpnpPunch run error: %s" % Debug.formatException(err)) self.log.warning("UpnpPunch run error: %s" % Debug.formatException(err))
return False return False
if self.testOpenport(port)["result"] is True: if self.testOpenport(port)["result"] is True:

4
src/Tor/TorManager.py
View file

@ -193,7 +193,7 @@ class TorManager(object):
except Exception, err: except Exception, err:
self.conn = None self.conn = None
self.setStatus(u"Error (%s)" % err) self.setStatus(u"Error (%s)" % err)
self.log.error("Tor controller connect error: %s" % Debug.formatException(err)) self.log.warning("Tor controller connect error: %s" % Debug.formatException(err))
self.enabled = False self.enabled = False
return self.conn return self.conn
@ -312,4 +312,4 @@ class TorManager(object):
else: else:
sock = socks.socksocket() sock = socks.socksocket()
sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port) sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port)
return sock return sock