We delete now with dba::delete - if available

[friendica-addons.git] / twitter / twitter_sync.php

diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php
index e8987f8f6adc73984693e9591a28cb492af3f162..6c76af7ce9b49cdefba058fa9b5ad47c7f924248 100644 (file)
--- a/twitter/twitter_sync.php
+++ b/twitter/twitter_sync.php
@@ -16,11 +16,11 @@ require_once("boot.php");
 function twitter_sync_run($argv, $argc){
        global $a, $db;
 
-       if(is_null($a)) {
+       if (is_null($a)) {
                $a = new App;
        }
 
-       if(is_null($db)) {
+       if (is_null($db)) {
                @include(".htconfig.php");
                require_once("include/dba.php");
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
@@ -31,11 +31,12 @@ function twitter_sync_run($argv, $argc){
        require_once("include/pidfile.php");
 
        $maxsysload = intval(get_config('system','maxloadavg'));
-       if($maxsysload < 1)
+       if ($maxsysload < 1) {
                $maxsysload = 50;
-       if(function_exists('sys_getloadavg')) {
+       }
+       if (function_exists('sys_getloadavg')) {
                $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload) {
+               if (intval($load[0]) > $maxsysload) {
                        logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
                        return;
                }
@@ -48,19 +49,21 @@ function twitter_sync_run($argv, $argc){
        $mode = intval($argv[1]);
        $uid = intval($argv[2]);
 
-       /// @todo Replace it with "App::is_already_running" in the next release
-       $lockpath = get_lockpath();
-       if ($lockpath != '') {
-               $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid);
-               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','addon/twitter/twitter_sync.php', $mode, $uid);
+       // This is deprecated with the worker
+       if (function_exists("get_lockpath")) {
+               $lockpath = get_lockpath();
+               if ($lockpath != '') {
+                       $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid);
+                       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','addon/twitter/twitter_sync.php', $mode, $uid);
+                               }
+                               exit;
                        }
-                       exit;
                }
        }