diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-19 15:51:22 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-19 15:51:22 -0700 |
| commit | 7e2af3dcae956c7490df74be8d94fa09a4bab673 (patch) | |
| tree | 2947bedd07061d2a0bab755c97445b30b4588ed4 /plugins/OStatus/classes/FeedSub.php | |
| parent | 5a0125691bd4002c38e83f29dd2721cb07b2027e (diff) | |
| parent | c84c4c6839c1791775cc698ad488bc23ed956d5b (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
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')) { |