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

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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index b6dd896cd77e9770c54354e62a92caeaee8f6ddc..9b8eb1cfec8b11aa1be350f7522cf350b60193c7 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -7,6 +7,8 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -37,15 +39,15 @@ class Cron
                if ($last) {
                        $next = $last + ($poll_interval * 60);
                        if ($next > time()) {
-                               logger('cron intervall not reached');
+                               Logger::log('cron intervall not reached');
                                return;
                        }
                }
 
-               logger('cron: start');
+               Logger::log('cron: start');
 
                // Fork the cron jobs in separate parts to avoid problems when one of them is crashing
-               Addon::forkHooks($a->queue['priority'], "cron");
+               Hook::fork($a->queue['priority'], "cron");
 
                // run queue delivery process in the background
                Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
@@ -123,7 +125,7 @@ class Cron
                // Poll contacts
                self::pollContacts($parameter, $generation);
 
-               logger('cron: end');
+               Logger::log('cron: end');
 
                Config::set('system', 'last_cron', time());
 
@@ -203,7 +205,7 @@ class Cron
                foreach ($contacts as $contact) {
 
                        if ($manual_id) {
-                               $contact['last-update'] = NULL_DATE;
+                               $contact['last-update'] = DBA::NULL_DATETIME;
                        }
 
                        // Friendica and OStatus are checked once a day
@@ -286,7 +288,7 @@ class Cron
                                $priority = PRIORITY_LOW;
                        }
 
-                       logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
+                       Logger::log("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
 
                        Worker::add(['priority' => $priority, 'dont_fork' => true], 'OnePoll', (int)$contact['id']);
                }