github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bugfix_ip_lookup' into dev

pull/1147/head
ibuler 2018-03-28 16:47:44 +08:00
parent 8014cc48b6 e1cab35db0
commit b959f1f68b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/users/utils.py
View File

@ -200,7 +200,7 @@ def get_ip_city(ip, timeout=10):
url = 'http://int.dpool.sina.com.cn/iplookup/iplookup.php?ip=%s&format=json' % ip
try:
r = requests.get(url, timeout=timeout)
except requests.Timeout:
except:
r = None
city = 'Unknown'
if r and r.status_code == 200: