Commit ee69ac9f authored by ericw's avatar ericw
Browse files

Update to error handling

parent 92dde879
......@@ -10,7 +10,7 @@ Tests the local FroNtier squid
# 3) file $CMS_PATH/SITECONF/local/JobConfig/site-local-config.xml
# contains the location of the local FroNtier squid server
#
__revision__ = "$Id: test_squid.py,v 1.9 2007/03/02 16:53:51 ericw Exp $"
__revision__ = "$Id: test_squid.py,v 1.10 2007/03/02 17:01:35 ericw Exp $"
import os
import sys
import urllib2
......@@ -143,8 +143,8 @@ t1 = time.time()
#
try:
result = urllib2.urlopen(request).read()
except urllib2.HTTPError, e:
message1 = e.msg
except urllib2.HTTPError, e1:
message1 = e1.msg
if site != "CERN":
print "test_squid.py: Error. squid " + squid + " is down, "
print " unreachable or will not reply."
......@@ -155,9 +155,9 @@ except urllib2.HTTPError, e:
print " is down, unreachable or will not reply."
print " urllib2.HTTPError: " + message1
sys.exit(same_error)
except urllib2.URLError, e:
except urllib2.URLError, e2:
print "urllib2.URLError"
message2 = e.reason[1]
message2 = e2.reason[1]
if site != "CERN":
print "test_squid.py: Error. squid " + squid + " is down, "
print " unreachable or will not reply."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment