diff options
| author | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
| commit | cd29d3d646379aa9a1352035973c8e379cc7f42b (patch) | |
| tree | e064c5292c546e6df8eaad9609a56150f69c62c3 /plugins/OStatus/classes/FeedSub.php | |
| parent | bd8506eee883ecd424fdf3d7e545c10c754df6ff (diff) | |
| parent | 1b3b7f9a422f6b703ec36d43e2283f91a9835f3b (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/classes/FeedSub.php')
| -rw-r--r-- | plugins/OStatus/classes/FeedSub.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php index b848b6b1d..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; @@ -110,7 +110,7 @@ class FeedSub extends Memcached_DataObject /*size*/ null, /*nullable*/ false, /*key*/ 'PRI', - /*default*/ '0', + /*default*/ null, /*extra*/ null, /*auto_increment*/ true), new ColumnDef('uri', 'varchar', @@ -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')) { @@ -450,3 +450,4 @@ class FeedSub extends Memcached_DataObject } } + |