From 43b10298fccc079093f20641c51d41646bf54439 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sat, 30 Jun 2018 11:14:54 +0200 Subject: [PATCH] [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