Merge pull request #6224 from annando/dba-delete-contact

[friendica.git] / src / Worker / PubSubPublish.php

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 07023e824793a1c8332d35fb4cd3ff3b4db855d0..801bdc888065e6b6fe2075803e9bcdbfeab9dd11 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -6,6 +6,7 @@
 namespace Friendica\Worker;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\PushSubscriber;
@@ -37,7 +38,7 @@ class PubSubPublish
                /// @todo Check server status with PortableContact::checkServer()
                // Before this can be done we need a way to safely detect the server url.
 
-               logger("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], LOGGER_DEBUG);
+               Logger::log("Generate feed of user " . $subscriber['nickname']. " to " . $subscriber['callback_url']. " - last updated " . $subscriber['last_update'], Logger::DEBUG);
 
                $last_update = $subscriber['last_update'];
                $params = OStatus::feed($subscriber['nickname'], $last_update);
@@ -54,19 +55,19 @@ class PubSubPublish
                                        $subscriber['topic']),
                                "X-Hub-Signature: sha1=" . $hmac_sig];
 
-               logger('POST ' . print_r($headers, true) . "\n" . $params, LOGGER_DATA);
+               Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
 
-               Network::post($subscriber['callback_url'], $params, $headers);
-               $ret = Network::getCurl()->getCode();
+               $postResult = Network::post($subscriber['callback_url'], $params, $headers);
+               $ret = $postResult->getReturnCode();
 
                $condition = ['id' => $subscriber['id']];
 
                if ($ret >= 200 && $ret <= 299) {
-                       logger('Successfully pushed to ' . $subscriber['callback_url']);
+                       Logger::log('Successfully pushed to ' . $subscriber['callback_url']);
 
                        PushSubscriber::reset($subscriber['id'], $last_update);
                } else {
-                       logger('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
+                       Logger::log('Delivery error when pushing to ' . $subscriber['callback_url'] . ' HTTP: ' . $ret);
 
                        PushSubscriber::delay($subscriber['id']);
                }