Merge pull request #502 from YunoHost/dyndns-timeout

[fix] timeout on get_public_ip otherwish dyndns update is stucked
This commit is contained in:
Bram 2018-06-30 15:19:16 +02:00 committed by GitHub
commit c2b9008bd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,7 +21,7 @@
import logging
import re
import subprocess
from urllib import urlopen
from moulinette.utils.network import download_text
logger = logging.getLogger('yunohost.utils.network')
@ -36,10 +36,7 @@ def get_public_ip(protocol=4):
else:
raise ValueError("invalid protocol version")
try:
return urlopen(url).read().strip()
except IOError:
return None
return download_text(url, timeout=30).strip()
def get_network_interfaces():