nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Networking module: add user-agent on isup request; fixes #39

Browse Source
This commit is contained in:
nemunaire 2014-05-05 09:55:47 +02:00
parent f8999d1e7f
commit da84a493ed
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/networking.py
View File

@ -3,9 +3,7 @@
import http.client import http.client
import json import json
import socket import socket
from urllib.parse import quote import urllib
from urllib.parse import urlparse
from urllib.request import urlopen
from tools import web from tools import web
@ -56,11 +54,12 @@ def cmd_isup(msg):
if 1 < len(msg.cmds) < 6: if 1 < len(msg.cmds) < 6:
res = list() res = list()
for url in msg.cmds[1:]: for url in msg.cmds[1:]:
o = urlparse(url, "http") o = urllib.parse.urlparse(url, "http")
if o.netloc == "": if o.netloc == "":
o = urlparse("http://" + url) o = urllib.parse.urlparse("http://" + url)
if o.netloc != "": if o.netloc != "":
raw = urlopen("http://isitup.org/" + o.netloc + ".json", timeout=10) 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 = json.loads(raw.read().decode())
if "status_code" in isup and isup["status_code"] == 1: if "status_code" in isup and isup["status_code"] == 1:
res.append(Response(msg.sender, "%s est accessible (temps de reponse : %ss)" % (isup["domain"], isup["response_time"]), channel=msg.channel)) res.append(Response(msg.sender, "%s est accessible (temps de reponse : %ss)" % (isup["domain"], isup["response_time"]), channel=msg.channel))