The worker now tells the process runtime length.

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index c92396dc7a446ce256e66f7e46d5d38d924c7a77..2fc8de51c5ebb25f61dde5820c67cc58ac6e9095 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -10,8 +10,11 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
        chdir($directory);
 }
 
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once("include/photos.php");
+require_once("include/user.php");
 
 
 function cron_run(&$argv, &$argc){
@@ -37,12 +40,11 @@ function cron_run(&$argv, &$argc){
        require_once('mod/nodeinfo.php');
        require_once('include/post_update.php');
 
-       load_config('config');
-       load_config('system');
+       Config::load();
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run") {
-               if (App::maxload_reached())
+               if ($a->maxload_reached())
                        return;
                if (App::is_already_running('cron', 'include/cron.php', 540))
                        return;
@@ -127,7 +129,7 @@ function cron_run(&$argv, &$argc){
 
                proc_run(PRIORITY_LOW, 'include/expire.php');
 
-               proc_run(PRIORITY_LOW, 'include/dbclean.php');
+               proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
 
                cron_update_photo_albums();
        }
@@ -238,11 +240,13 @@ function cron_poll_contacts($argc, $argv) {
                : ''
        );
 
-       $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-               WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
-               $sql_extra
-               AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
-               AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
+       $contacts = q("SELECT `contact`.`id` FROM `user`
+                       STRAIGHT_JOIN `contact`
+                       ON `contact`.`uid` = `user`.`uid` AND `contact`.`rel` IN (%d, %d) AND `contact`.`poll` != ''
+                               AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
+                               AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
+                               AND NOT `contact`.`archive`
+                       WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DFRN),
@@ -263,8 +267,9 @@ function cron_poll_contacts($argc, $argv) {
                        intval($c['id'])
                );
 
-               if((! $res) || (! count($res)))
+               if (!dbm::is_result($res)) {
                        continue;
+               }
 
                foreach($res as $contact) {
 
@@ -342,7 +347,7 @@ function cron_poll_contacts($argc, $argv) {
  *
  * @param App $a
  */
-function cron_clear_cache(&$a) {
+function cron_clear_cache(App $a) {
 
        $last = get_config('system','cache_last_cleared');
 
@@ -429,11 +434,11 @@ function cron_clear_cache(&$a) {
  *
  * @param App $a
  */
-function cron_repair_diaspora(&$a) {
+function cron_repair_diaspora(App $a) {
        $r = q("SELECT `id`, `url` FROM `contact`
                WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
                        ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
-       if ($r) {
+       if (dbm::is_result($r)) {
                foreach ($r AS $contact) {
                        if (poco_reachable($contact["url"])) {
                                $data = probe_url($contact["url"]);
@@ -454,6 +459,16 @@ function cron_repair_diaspora(&$a) {
  */
 function cron_repair_database() {
 
+       // Sometimes there seem to be issues where the "self" contact vanishes.
+       // We haven't found the origin of the problem by now.
+       $r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
+       if (dbm::is_result($r)) {
+               foreach ($r AS $user) {
+                       logger('Create missing self contact for user '.$user['uid']);
+                       user_create_self_contact($user['uid']);
+               }
+       }
+
        // Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
        // This call is very "cheap" so we can do it at any time without a problem
        q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
@@ -463,7 +478,7 @@ function cron_repair_database() {
 
        // Update the global contacts for local users
        $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
-       if ($r)
+       if (dbm::is_result($r))
                foreach ($r AS $user)
                        update_gcontact_for_user($user["uid"]);