mirrorlist-server/mirrorlist_server.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit bb8c3038cf9f76fa39e8580a990d7d9edef7f43c
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon May 17 10:15:34 2010 -0500
mirrorlist_server: handle more failures gracefully
Handle being passed a bad country= value.
Catch all failures in do_mirrorlist() and return a proper error
message. This should also prevent failures in mirrorlist_server from
causing mirrorlist_client() to spin indefinitely waiting for an answer.
diff --git a/mirrorlist-server/mirrorlist_server.py
b/mirrorlist-server/mirrorlist_server.py
index e909927..0d73469 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -262,7 +262,7 @@ def do_countrylist(kwargs, cache, clientCountry, requested_countries,
header):
def get_same_continent_countries(clientCountry, requested_countries):
result = []
for r in requested_countries:
- if r is not None:
+ if r in country_continents:
requestedCountries = [c.upper() for c in continents[country_continents[r]] \
if c != clientCountry ]
result.extend(requestedCountries)
@@ -690,17 +690,22 @@ class MirrorlistHandler(StreamRequestHandler):
pass
try:
- r = do_mirrorlist(d)
+ try:
+ r = do_mirrorlist(d)
+ except:
+ raise
message = r['message']
results = r['results']
resulttype = r['resulttype']
returncode = r['returncode']
except:
- message='# Server Error'
+ message=u'# Bad Request'
+ returncode = 400
+ results = []
+ resulttype = 'mirrorlist'
if d['metalink']:
resulttype = 'metalink'
- results = errordoc(d['metalink'], message)
- returncode = 500
+ results = errordoc(d['metalink'], message)
del d
del p
Show replies by date