YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Using request insteqd of urlretrieve, to have timeout

Browse source
This commit is contained in:
Alexandre Aubin 2017-02-06 12:54:32 -05:00
parent 5b006dbf0e
commit 730156dd92
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/yunohost/app.py
View file

@ -35,8 +35,8 @@ import socket
import urlparse
import errno
import subprocess
import requests
from collections import OrderedDict
from urllib import urlretrieve
from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger
@ -100,12 +100,18 @@ def app_fetchlist(url=None, name=None):
raise MoulinetteError(errno.EINVAL,
m18n.n('custom_appslist_name_required'))
# Download file
try:
logger.info("Fetching app list '%s' from %s ...", name, url)
urlretrieve(url, '%s/%s.json' % (repo_path, name))
applist = requests.get(url, timeout=30).text
except Exception as e:
raise MoulinetteError(errno.EBADR, m18n.n('appslist_retrieve_error'), error=str(e))
raise MoulinetteError(errno.EBADR, m18n.n('appslist_retrieve_error', error=str(e)))
# Write app list to file
list_file = '%s/%s.json' % (repo_path, name)
with open(list_file, "w") as f:
f.write(applist)
# Setup a cron job to re-fetch the list at midnight
open("/etc/cron.d/yunohost-applist-%s" % name, "w").write('00 00 * * * root yunohost app fetchlist -u %s -n %s > /dev/null 2>&1\n' % (url, name))
logger.success(m18n.n('appslist_fetched'))