diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-19 15:47:43 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-19 15:47:43 -0700 |
| commit | c84c4c6839c1791775cc698ad488bc23ed956d5b (patch) | |
| tree | 70eec5a8589edd3c8f5ca15d296db28bfc0e9f1e /plugins/OStatus/classes/FeedSub.php | |
| parent | 79ec565104b8d546e4f2ffca2f351fba1be753d2 (diff) | |
OStatus: be a little laxer about attempts to start/stop PuSH subscriptions that were left in an inconsistent state.
Instead of aborting, we'll try to reconfirm the sub/unsub, which once confirmed will replace whatever the previous state was on the server side.
Diffstat (limited to 'plugins/OStatus/classes/FeedSub.php')
| -rw-r--r-- | plugins/OStatus/classes/FeedSub.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php index 80ba37bc1..b10509dae 100644 --- a/plugins/OStatus/classes/FeedSub.php +++ b/plugins/OStatus/classes/FeedSub.php @@ -61,7 +61,7 @@ class FeedSub extends Memcached_DataObject public $__table = 'feedsub'; public $id; - public $feeduri; + public $uri; // PuSH subscription data public $huburi; @@ -238,7 +238,7 @@ class FeedSub extends Memcached_DataObject public function subscribe($mode='subscribe') { if ($this->sub_state && $this->sub_state != 'inactive') { - throw new ServerException("Attempting to start PuSH subscription to feed in state $this->sub_state"); + common_log(LOG_WARNING, "Attempting to (re)start PuSH subscription to $this->uri in unexpected state $this->sub_state"); } if (empty($this->huburi)) { if (common_config('feedsub', 'nohub')) { @@ -261,7 +261,7 @@ class FeedSub extends Memcached_DataObject */ public function unsubscribe() { if ($this->sub_state != 'active') { - throw new ServerException("Attempting to end PuSH subscription to feed in state $this->sub_state"); + common_log(LOG_WARNING, "Attempting to (re)end PuSH subscription to $this->uri in unexpected state $this->sub_state"); } if (empty($this->huburi)) { if (common_config('feedsub', 'nohub')) { |