More Exceptions for FeedSub doSubscribe and related functions

[quix0rs-gnu-social.git] / plugins / OStatus / scripts / resub-feed.php

diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php
index e4c64fdcc5aaf082f549769b109da02f8855ec59..3d13724f7db1336979a951e6f5616c8bae1dba9a 100644 (file)
--- a/plugins/OStatus/scripts/resub-feed.php
+++ b/plugins/OStatus/scripts/resub-feed.php
@@ -53,20 +53,18 @@ if (!$sub) {
 print "Old state:\n";
 showSub($sub);
 
-print "\n";
-
-if (have_option('u') || have_option('--unsub')) {
-    print "Pinging hub $sub->huburi with unsubscription for $sub->uri\n";
-    $ok = $sub->unsubscribe();
-} else {
-    print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
-    $ok = $sub->subscribe();
-}
-
-if ($ok) {
-    print "ok\n";
-} else {
-    print "Could not confirm.\n";
+try {
+    echo "\n";
+    if (have_option('u') || have_option('--unsub')) {
+        echo "Pinging hub {$sub->huburi} with unsubscription for {$sub->uri}\n";
+        $sub->unsubscribe();
+    } else {
+        echo "Pinging hub {$sub->huburi} with new subscription for {$sub->uri}\n";
+        $sub->subscribe();
+    }
+    echo "ok\n";
+} catch (Exception $e) {
+    echo 'Could not confirm. '.get_class($e).': '.$e->getMessage()."\n";
 }
 
 $sub2 = FeedSub::getKV('uri', $feedurl);