Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url

[friendica.git] / include / pubsubpublish.php

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index e7a55f5f09f37b682af45b5c11e3129c8011d452..625eefc261b69af08b4011d44265ffd1ddb61a1f 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -16,7 +16,7 @@ function handle_pubsubhubbub() {
 
                logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-               $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
+               $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
                $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
                $headers = array("Content-type: application/atom+xml",
@@ -74,28 +74,14 @@ function pubsubpublish_run(&$argv, &$argc){
        };
 
        require_once('include/items.php');
-       require_once('include/pidfile.php');
 
        load_config('config');
        load_config('system');
 
        // Don't check this stuff if the function is called by the poller
-       if (App::callstack() != "poller_run") {
-               $lockpath = get_lockpath();
-               if ($lockpath != '') {
-                       $pidfile = new pidfile($lockpath, 'pubsubpublish');
-                       if($pidfile->is_already_running()) {
-                               logger("Already running");
-                               if ($pidfile->running_time() > 9*60) {
-                                       $pidfile->kill();
-                                       logger("killed stale process");
-                                       // Calling a new instance
-                                       proc_run('php',"include/pubsubpublish.php");
-                               }
-                               return;
-                       }
-               }
-       }
+       if (App::callstack() != "poller_run")
+               if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
+                       return;
 
        $a->set_baseurl(get_config('system','url'));