More properly handle http errors when performing subdomain verify

pyi2phosts/postkey/views.py

@@ -128,14 +128,17 @@ def subdomain(request):
                 log.debug('trying to open %s', url)
                 resp = opener.open(url, timeout=60)
             except urllib2.URLError, e:
-                if hasattr(e, 'reason'):
+                error = ''
-                    log.warning('%s: failed to reach server, reason: %s', request.session['topdomain'], e.reason)
+                if hasattr(e, 'code'):
-                elif hasattr(e, 'code'):
+                    error = str(e.code)
                     log.warning('%s can\'t finish the request, error code: %s',
                             request.session['topdomain'], e.code)
+                if hasattr(e, 'reason'):
+                    error += ' - ' + str(e.reason)
+                    log.warning('%s: failed to reach server, reason: %s', request.session['topdomain'], e.reason)
                 return render_to_response('subdomain_http_verify_failure.html', {
                     'title': settings.SITE_NAME,
-                    'code': e.code,
+                    'error': error,
                     }, context_instance=RequestContext(request))
             else:
                 log.debug('subdomain verification success, saving host')

pyi2phosts/templates/subdomain_http_verify_failure.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 <p>
-{% trans "Verification failed. Webserver returned http code:" %} {{ code }}
+{% trans "Verification failed. An error occured:" %} {{ error }}
 </p>
 
 {% endblock %}