Merge pull request #127 from KaneTW/patch-2
down.py URL bugfix and detailed error messages
This commit is contained in:
commit
c6f3423efa
|
@ -7,6 +7,10 @@ from util import hook, http
|
||||||
def down(inp):
|
def down(inp):
|
||||||
'''.down <url> -- checks to see if the website is down'''
|
'''.down <url> -- checks to see if the website is down'''
|
||||||
|
|
||||||
|
# urlparse follows RFC closely, so we have to check for schema existance and prepend empty schema if necessary
|
||||||
|
if not inp.startswith('//') and '://' not in inp:
|
||||||
|
inp = '//' + inp
|
||||||
|
|
||||||
urlp = urlparse.urlparse(inp, 'http')
|
urlp = urlparse.urlparse(inp, 'http')
|
||||||
|
|
||||||
if urlp.scheme not in ('http', 'https'):
|
if urlp.scheme not in ('http', 'https'):
|
||||||
|
@ -18,5 +22,5 @@ def down(inp):
|
||||||
try:
|
try:
|
||||||
http.get(inp, get_method='HEAD')
|
http.get(inp, get_method='HEAD')
|
||||||
return inp + ' seems to be up'
|
return inp + ' seems to be up'
|
||||||
except http.URLError:
|
except http.URLError as error:
|
||||||
return inp + ' seems to be down'
|
return inp + ' seems to be down. Error: %s' % error.reason
|
||||||
|
|
Loading…
Reference in New Issue