X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=b28c4216198e454c5cafe998435b2c0949481dfa;hb=a6fb3568f989f72164b435baafc63a174397b542;hp=c859824755a1a5ee79ff12b6fbd3b10c98874dc2;hpb=5f25ef55d2482e3a1de54907efa63e0be1d0e93f;p=friendica.git diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index c859824755..b28c421619 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -1,15 +1,23 @@ queue['priority'], "cron"); + // run queue delivery process in the background - Worker::add(PRIORITY_NEGLIGIBLE, "queue"); + Worker::add(PRIORITY_NEGLIGIBLE, "Queue"); // run the process to discover global contacts in the background - Worker::add(PRIORITY_LOW, "discover_poco"); + Worker::add(PRIORITY_LOW, "DiscoverPoCo"); // run the process to update locally stored global contacts in the background - Worker::add(PRIORITY_LOW, "discover_poco", "checkcontact"); + Worker::add(PRIORITY_LOW, "DiscoverPoCo", "checkcontact"); // Expire and remove user entries - Worker::add(PRIORITY_MEDIUM, "cronjobs", "expire_and_remove_users"); + Worker::add(PRIORITY_MEDIUM, "CronJobs", "expire_and_remove_users"); // Call possible post update functions - Worker::add(PRIORITY_LOW, "cronjobs", "post_update"); - - // update nodeinfo data - Worker::add(PRIORITY_LOW, "cronjobs", "nodeinfo"); + Worker::add(PRIORITY_LOW, "CronJobs", "post_update"); // Clear cache entries - Worker::add(PRIORITY_LOW, "cronjobs", "clear_cache"); + Worker::add(PRIORITY_LOW, "CronJobs", "clear_cache"); // Repair missing Diaspora values in contacts - Worker::add(PRIORITY_LOW, "cronjobs", "repair_diaspora"); + Worker::add(PRIORITY_LOW, "CronJobs", "repair_diaspora"); // Repair entries in the database - Worker::add(PRIORITY_LOW, "cronjobs", "repair_database"); + Worker::add(PRIORITY_LOW, "CronJobs", "repair_database"); // once daily run birthday_updates and then expire in background $d1 = Config::get('system', 'last_expire_day'); - $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); + $d2 = intval(DateTimeFormat::utcNow('d')); + // Daily cron calls if ($d2 != intval($d1)) { - Worker::add(PRIORITY_LOW, "cronjobs", "update_contact_birthdays"); + Worker::add(PRIORITY_LOW, "CronJobs", "update_contact_birthdays"); - Worker::add(PRIORITY_LOW, "discover_poco", "update_server"); + Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums"); - Worker::add(PRIORITY_LOW, "discover_poco", "suggestions"); + // update nodeinfo data + Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo"); - Config::set('system', 'last_expire_day', $d2); + Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server"); - Worker::add(PRIORITY_LOW, 'expire'); + Worker::add(PRIORITY_LOW, "DiscoverPoCo", "suggestions"); - Worker::add(PRIORITY_MEDIUM, 'dbclean'); + Worker::add(PRIORITY_LOW, 'Expire'); - Worker::add(PRIORITY_LOW, "cronjobs", "update_photo_albums"); + Worker::add(PRIORITY_MEDIUM, 'DBClean'); + + // check upstream version? + Worker::add(PRIORITY_LOW, 'CheckVersion'); + + Config::set('system', 'last_expire_day', $d2); + } + + // Hourly cron calls + if (Config::get('system', 'last_cron_hourly', 0) + 3600 < time()) { // Delete all done workerqueue entries - dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR')); + DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']); - // check upstream version? - Worker::add(PRIORITY_LOW, 'checkversion'); + // Optimizing this table only last seconds + if (Config::get('system', 'optimize_workerqueue', false)) { + DBA::e("OPTIMIZE TABLE `workerqueue`"); + } + + Config::set('system', 'last_cron_hourly', time()); + } + + // Ensure to have a .htaccess file. + // this is a precaution for systems that update automatically + $basepath = $a->get_basepath(); + if (!file_exists($basepath . '/.htaccess')) { + copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess'); } // Poll contacts @@ -132,9 +162,9 @@ Class Cron { $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); - reload_plugins(); + Addon::reload(); - $d = datetime_convert(); + $d = DateTimeFormat::utcNow(); // Only poll from those with suitable relationships, // and which have a polling address and ignore Diaspora since @@ -149,115 +179,114 @@ Class Cron { : '' ); - $contacts = q("SELECT `contact`.`id` FROM `user` + $contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`, + `contact`.`last-update`, `contact`.`priority`, `contact`.`rel`, `contact`.`subhub` + 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), - dbesc(NETWORK_ZOT), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_FEED), - dbesc(NETWORK_MAIL), - dbesc(NETWORK_MAIL2) + ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != '' + AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra + AND NOT `contact`.`self` AND NOT `contact`.`blocked` + WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql", + DBA::escape(NETWORK_DFRN), + DBA::escape(NETWORK_OSTATUS), + DBA::escape(NETWORK_DIASPORA), + DBA::escape(NETWORK_FEED), + DBA::escape(NETWORK_MAIL) ); - if (!DBM::is_result($contacts)) { + if (!DBA::isResult($contacts)) { return; } - foreach ($contacts as $c) { + foreach ($contacts as $contact) { - $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", - intval($c['id']) - ); + if ($manual_id) { + $contact['last-update'] = NULL_DATE; + } - if (!DBM::is_result($res)) { - continue; + // Friendica and OStatus are checked once a day + if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) { + $contact['priority'] = 2; } - foreach ($res as $contact) { + if ($contact['subhub'] && in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) { + /* + * We should be getting everything via a hub. But just to be sure, let's check once a day. + * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) + * This also lets us update our subscription to the hub, and add or replace hubs in case it + * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + */ + $poll_interval = Config::get('system', 'pushpoll_frequency'); + $contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3); + } - $xml = false; + // Check Diaspora contacts or followers once a week + if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) { + $contact['priority'] = 4; + } - if ($manual_id) { - $contact['last-update'] = NULL_DATE; - } + // Check archived contacts once a month + if ($contact['archive']) { + $contact['priority'] = 5; + } - if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - $contact['priority'] = 2; + if (($contact['priority'] >= 0) && !$force) { + $update = false; + + $t = $contact['last-update']; + + /* + * Based on $contact['priority'], should we poll this site now? Or later? + */ + switch ($contact['priority']) { + case 5: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 month")) { + $update = true; + } + break; + case 4: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 week")) { + $update = true; + } + break; + case 3: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) { + $update = true; + } + break; + case 2: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 12 hour")) { + $update = true; + } + break; + case 1: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 hour")) { + $update = true; + } + break; + case 0: + default: + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) { + $update = true; + } + break; } - - if ($contact['subhub'] && in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { - /* - * We should be getting everything via a hub. But just to be sure, let's check once a day. - * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - * This also lets us update our subscription to the hub, and add or replace hubs in case it - * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - */ - $poll_interval = Config::get('system', 'pushpoll_frequency'); - $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); + if (!$update) { + continue; } + } - if (($contact['priority'] >= 0) && !$force) { - $update = false; - - $t = $contact['last-update']; - - /* - * Based on $contact['priority'], should we poll this site now? Or later? - */ - switch ($contact['priority']) { - case 5: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { - $update = true; - } - break; - case 4: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) { - $update = true; - } - break; - case 3: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { - $update = true; - } - break; - case 2: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) { - $update = true; - } - break; - case 1: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) { - $update = true; - } - break; - case 0: - default: - if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + ".$min_poll_interval." minute")) { - $update = true; - } - break; - } - if (!$update) { - continue; - } - } + if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) { + $priority = PRIORITY_MEDIUM; + } elseif ($contact['archive']) { + $priority = PRIORITY_NEGLIGIBLE; + } else { + $priority = PRIORITY_LOW; + } - logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); + logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]); - if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) { - $priority = PRIORITY_MEDIUM; - } else { - $priority = PRIORITY_LOW; - } - Worker::add(array('priority' => $priority, 'dont_fork' => true), 'OnePoll', (int)$contact['id']); - } + Worker::add(['priority' => $priority, 'dont_fork' => true], 'OnePoll', (int)$contact['id']); } } }