nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

[networking] use getJSON

Browse source
This commit is contained in:
nemunaire 2014-12-15 23:57:37 +01:00
commit a1c086a807
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/networking/isup.py
View file

@ -1,6 +1,6 @@
import json
import urllib
from tools.web import getJSON
def isup(url):
"""Determine if the given URL is up or not
@ -13,9 +13,7 @@ def isup(url):
if o.netloc == "":
o = urllib.parse.urlparse("http://" + url)
if o.netloc != "":
req = urllib.request.Request("http://isitup.org/%s.json" % (o.netloc), headers={ 'User-Agent' : "nemubot v3" })
raw = urllib.request.urlopen(req, timeout=10)
isup = json.loads(raw.read().decode())
isup = getJSON("http://isitup.org/%s.json" % o.netloc)
if "status_code" in isup and isup["status_code"] == 1:
return isup["response_time"]