X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fping.php;h=be2933ae34016fb8dd17901e320ca86f6596c5be;hb=9bb48c36eab5e6856b7768c273d382a825f22ff0;hp=5698c403875e52b584b80a5fd5f86d8b93a4699f;hpb=d9cde0ef80ee838a99035d44f0286b3cc902e332;p=quix0rs-gnu-social.git

diff --git a/lib/ping.php b/lib/ping.php
index 5698c40387..be2933ae34 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
-	if (!$notice->is_local) {
+	if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
 		return true;
 	}
 
@@ -45,7 +45,15 @@ function ping_broadcast_notice($notice) {
 											   $tags));
 
             $request = HTTPClient::start();
-            $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
+            $request->setConfig('connect_timeout', common_config('ping', 'timeout'));
+            $request->setConfig('timeout', common_config('ping', 'timeout'));
+            try {
+                $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
+            } catch (Exception $e) {
+                common_log(LOG_ERR,
+                           "Exception pinging $notify_url: " . $e->getMessage());
+                continue;
+            }
 
             if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
                 common_log(LOG_WARNING,
@@ -115,4 +123,4 @@ function ping_notice_tags($notice) {
 		return implode('|', $tags);
 	}
 	return NULL;
-}
\ No newline at end of file
+}