diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-18 10:55:20 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-18 10:55:20 -0700 |
| commit | 1de7badd78bb3cddc99a6960ec6a395a191ce6be (patch) | |
| tree | 54e30bc1608cec62a88b3e0e77c5a47b97a071f1 /plugins/OStatus/scripts | |
| parent | ca5612c451e4dabde107ff2cfbc737a2f69136df (diff) | |
| parent | 515cdf28a83eda5cc82f0c423099a36c0168dbb6 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/scripts')
| -rw-r--r-- | plugins/OStatus/scripts/updateostatus.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/OStatus/scripts/updateostatus.php b/plugins/OStatus/scripts/updateostatus.php index d553a7d62..315b49273 100644 --- a/plugins/OStatus/scripts/updateostatus.php +++ b/plugins/OStatus/scripts/updateostatus.php @@ -56,7 +56,12 @@ try { $user = new User(); if ($user->find()) { while ($user->fetch()) { - updateOStatus($user); + try { + updateOStatus($user); + } catch (Exception $e) { + common_log(LOG_NOTICE, "Couldn't convert OMB subscriptions ". + "for {$user->nickname} to OStatus: " . $e->getMessage()); + } } } } else { @@ -107,8 +112,8 @@ function updateOStatus($user) if (!have_option('q', 'quiet')) { echo "Converting..."; } - Subscription::cancel($up, $rp); Subscription::start($up, $op->localProfile()); + Subscription::cancel($up, $rp); if (!have_option('q', 'quiet')) { echo "done.\n"; } @@ -118,8 +123,7 @@ function updateOStatus($user) if (!have_option('q', 'quiet')) { echo "fail.\n"; } - continue; - common_log(LOG_WARNING, "Couldn't convert OMB subscription (" . $up->nickname . ", " . $rp->nickname . + common_log(LOG_NOTICE, "Couldn't convert OMB subscription (" . $up->nickname . ", " . $rp->nickname . ") to OStatus: " . $e->getMessage()); continue; } |