diff options
| author | Britney Fransen <brfransen@gmail.com> | 2018-02-06 16:32:00 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2018-02-06 16:32:00 (GMT) |
| commit | 8d35f28049488f2585ef765bf48e7a58958fd587 (patch) | |
| tree | f55a41114b89a879bb64063f6718c708394e673c /abs/core/supplemental-web | |
| parent | 8b62e097a7aa99c5a5a4a7a81da9a04dd35b2cf7 (diff) | |
| parent | 95b7ac61b0922b6808b6c3085f6e876c3b713602 (diff) | |
| download | linhes_pkgbuild-8d35f28049488f2585ef765bf48e7a58958fd587.zip linhes_pkgbuild-8d35f28049488f2585ef765bf48e7a58958fd587.tar.gz linhes_pkgbuild-8d35f28049488f2585ef765bf48e7a58958fd587.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/supplemental-web')
| -rw-r--r-- | abs/core/supplemental-web/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/fe_status.py | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 4fcef9e..b68c9e7 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=supplemental-web pkgname=('supplemental-web' 'supplemental-web-slave') pkgver=8.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') backup=('data/srv/httpd/cgi/extra.cfg.txt') diff --git a/abs/core/supplemental-web/contents/fe_status.py b/abs/core/supplemental-web/contents/fe_status.py index 439d0c5..c66d8f9 100644 --- a/abs/core/supplemental-web/contents/fe_status.py +++ b/abs/core/supplemental-web/contents/fe_status.py @@ -67,11 +67,14 @@ def mythfe_status(cursor,mythDB): fe_hostname = socket.gethostbyaddr(i)[0] except: #print "DNS lookup failed for %s" %i - fe_hostname = socket.gethostbyname(i) - ip_addr = socket.gethostbyname(i) - fe_hostname = "%s (%s)" %(fe_hostname,ip_addr) - status_dict[fe_hostname] = parse_xml(ip_addr) - + fe_hostname = i + try: + ip_addr = socket.gethostbyname(i) + fe_hostname = "%s (%s)" %(fe_hostname,ip_addr) + status_dict[fe_hostname] = parse_xml(ip_addr) + except: + fe_hostname = "%s" %fe_hostname + status_dict[fe_hostname] = parse_xml(fe_hostname) return status_dict |