nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

action_utils: Expose URL checking utility for generic use

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Sunil Mohan Adapa 2019-02-04 16:54:06 -08:00
parent 2565737f38
commit c0de223ae4
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plinth/action_utils.py
View File

@ -348,12 +348,9 @@ def _check_port(port, kind='tcp', listen_address=None):
return False return False
def diagnose_url(url, kind=None, env=None, check_certificate=True, def check_url(url, kind=None, env=None, check_certificate=True,
extra_options=None, wrapper=None, expected_output=None): extra_options=None, wrapper=None, expected_output=None):
"""Run a diagnostic on whether a URL is accessible. """Check whether a URL is accessible."""
Kind can be '4' for IPv4 or '6' for IPv6.
"""
command = ['curl', '-f', '-w', '%{response_code}', url] command = ['curl', '-f', '-w', '%{response_code}', url]
if wrapper: if wrapper:
@ -383,13 +380,25 @@ def diagnose_url(url, kind=None, env=None, check_certificate=True,
except FileNotFoundError: except FileNotFoundError:
result = 'error' result = 'error'
return result
def diagnose_url(url, kind=None, env=None, check_certificate=True,
extra_options=None, wrapper=None, expected_output=None):
"""Run a diagnostic on whether a URL is accessible.
Kind can be '4' for IPv4 or '6' for IPv6.
"""
result = check_url(url, kind, env, check_certificate, extra_options,
wrapper, expected_output)
if kind: if kind:
return [ return [
_('Access URL {url} on tcp{kind}').format(url=url, kind=kind), _('Access URL {url} on tcp{kind}').format(url=url, kind=kind),
result result
] ]
else:
return [_('Access URL {url}').format(url=url), result] return [_('Access URL {url}').format(url=url), result]
def diagnose_url_on_all(url, **kwargs): def diagnose_url_on_all(url, **kwargs):