diff options
author | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
commit | b8001ea1079c4c8895fd2323e1e4a47c0d71fde3 (patch) | |
tree | b732b239bf790c78c90f4c7d3be7044ce9f7da45 /plugins/OStatus/lib/huboutqueuehandler.php | |
parent | e3c4b0c85d3fbae9604b22d3666fe36a3c1c7551 (diff) | |
parent | 064c45890f896f2af8a0231449fa5337bb79c509 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/lib/huboutqueuehandler.php')
-rw-r--r-- | plugins/OStatus/lib/huboutqueuehandler.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/plugins/OStatus/lib/huboutqueuehandler.php b/plugins/OStatus/lib/huboutqueuehandler.php index 0791c7e5d..3ad94646e 100644 --- a/plugins/OStatus/lib/huboutqueuehandler.php +++ b/plugins/OStatus/lib/huboutqueuehandler.php @@ -33,6 +33,7 @@ class HubOutQueueHandler extends QueueHandler { $sub = $data['sub']; $atom = $data['atom']; + $retries = $data['retries']; assert($sub instanceof HubSub); assert(is_string($atom)); @@ -40,13 +41,20 @@ class HubOutQueueHandler extends QueueHandler try { $sub->push($atom); } catch (Exception $e) { - common_log(LOG_ERR, "Failed PuSH to $sub->callback for $sub->topic: " . - $e->getMessage()); - // @fixme Reschedule a later delivery? - return true; + $retries--; + $msg = "Failed PuSH to $sub->callback for $sub->topic: " . + $e->getMessage(); + if ($retries > 0) { + common_log(LOG_ERR, "$msg; scheduling for $retries more tries"); + + // @fixme when we have infrastructure to schedule a retry + // after a delay, use it. + $sub->distribute($atom, $retries); + } else { + common_log(LOG_ERR, "$msg; discarding"); + } } return true; } } - |