From 43b10298fccc079093f20641c51d41646bf54439 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sat, 30 Jun 2018 11:14:54 +0200 Subject: [PATCH 1/2] [fix] timeout on get_public_ip otherwish dyndns update is stucked --- src/yunohost/utils/network.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/yunohost/utils/network.py b/src/yunohost/utils/network.py index dec0384bf..4398a80f6 100644 --- a/src/yunohost/utils/network.py +++ b/src/yunohost/utils/network.py @@ -21,7 +21,9 @@ import logging import re import subprocess -from urllib import urlopen +import requests + +from requests import ConnectionError logger = logging.getLogger('yunohost.utils.network') @@ -37,8 +39,8 @@ def get_public_ip(protocol=4): raise ValueError("invalid protocol version") try: - return urlopen(url).read().strip() - except IOError: + return requests.get(url, timeout=30).content.strip() + except ConnectionError: return None From 834088551f66764d889b7761be9eb6f7b27a1f3d Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sat, 30 Jun 2018 14:39:31 +0200 Subject: [PATCH 2/2] [fix] uses moulinette download_text utils --- src/yunohost/utils/network.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/yunohost/utils/network.py b/src/yunohost/utils/network.py index 4398a80f6..871b3e6d1 100644 --- a/src/yunohost/utils/network.py +++ b/src/yunohost/utils/network.py @@ -21,9 +21,7 @@ import logging import re import subprocess -import requests - -from requests import ConnectionError +from moulinette.utils.network import download_text logger = logging.getLogger('yunohost.utils.network') @@ -38,10 +36,7 @@ def get_public_ip(protocol=4): else: raise ValueError("invalid protocol version") - try: - return requests.get(url, timeout=30).content.strip() - except ConnectionError: - return None + return download_text(url, timeout=30).strip() def get_network_interfaces():