Revision: 363
Author: bslatkin
Date: Thu Jun 3 16:53:03 2010
Log: hub fix for status codes 200-299 on delivery
http://code.google.com/p/pubsubhubbub/source/detail?r=363
Modified:
/trunk/hub/main.py
/trunk/hub/main_test.py
=======================================
--- /trunk/hub/main.py Thu Jun 3 16:30:46 2010
+++ /trunk/hub/main.py Thu Jun 3 16:53:03 2010
@@ -2711,7 +2711,7 @@
def callback(sub, result, exception):
end_time = time.time()
latency = int((end_time - start_time) * 1000)
- if exception or result.status_code not in (200, 204):
+ if exception or not (200 <= result.status_code <= 299):
logging.warning('Could not deliver to target url %s: '
'Exception = %r, status_code = %s',
sub.callback, exception,
=======================================
--- /trunk/hub/main_test.py Thu Jun 3 16:20:53 2010
+++ /trunk/hub/main_test.py Thu Jun 3 16:53:03 2010
@@ -2208,11 +2208,11 @@
self.callback3, self.topic, 'token', 'secret'))
main.EVENT_SUBSCRIBER_CHUNK_SIZE = 3
urlfetch_test_stub.instance.expect(
- 'post', self.callback1, 204, '',
request_payload=self.expected_payload)
+ 'post', self.callback1, 200, '',
request_payload=self.expected_payload)
urlfetch_test_stub.instance.expect(
- 'post', self.callback2, 200, '',
request_payload=self.expected_payload)
+ 'post', self.callback2, 204, '',
request_payload=self.expected_payload)
urlfetch_test_stub.instance.expect(
- 'post', self.callback3, 204, '',
request_payload=self.expected_payload)
+ 'post', self.callback3, 299, '',
request_payload=self.expected_payload)
event = EventToDeliver.create_event_for_topic(
self.topic, main.ATOM, self.header_footer, self.test_payloads)
event.put()