]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/Cron.php
Fixed E_NOTICE in boot.php and DBA class (#5430)
[friendica.git] / src / Worker / Cron.php
index 5814c0548768eba9a17776b4352986825b452a04..bf1b44f55d4e0c0530c0729a5f72c5c67cfa6a66 100644 (file)
@@ -4,16 +4,21 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
-use dba;
+use Friendica\Util\DateTimeFormat;
 
-Class Cron {
-       public static function execute($parameter = '', $generation = 0) {
-               global $a;
+require_once 'include/dba.php';
 
-               require_once 'include/datetime.php';
+class Cron
+{
+       public static function execute($parameter = '', $generation = 0)
+       {
+               $a = BaseObject::getApp();
 
                // Poll contacts with specific parameters
                if (!empty($parameter)) {
@@ -38,6 +43,9 @@ Class Cron {
 
                logger('cron: start');
 
+               // Fork the cron jobs in separate parts to avoid problems when one of them is crashing
+               Addon::forkHooks($a->queue['priority'], "cron");
+
                // run queue delivery process in the background
                Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
 
@@ -53,9 +61,6 @@ Class Cron {
                // Call possible post update functions
                Worker::add(PRIORITY_LOW, "CronJobs", "post_update");
 
-               // update nodeinfo data
-               Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo");
-
                // Clear cache entries
                Worker::add(PRIORITY_LOW, "CronJobs", "clear_cache");
 
@@ -67,29 +72,51 @@ Class Cron {
 
                // 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_photo_albums");
+
+                       // update nodeinfo data
+                       Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo");
+
                        Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server");
 
                        Worker::add(PRIORITY_LOW, "DiscoverPoCo", "suggestions");
 
-                       Config::set('system', 'last_expire_day', $d2);
-
                        Worker::add(PRIORITY_LOW, 'Expire');
 
                        Worker::add(PRIORITY_MEDIUM, 'DBClean');
 
-                       Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums");
+                       // 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
@@ -136,9 +163,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
@@ -153,14 +180,13 @@ Class Cron {
                        : ''
                );
 
-               $contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`,
-                                       `contact`.`last-update`, `contact`.`priority`, `contact`.`subhub`
+               $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`.`poll` != ''
                                        AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
-                                       AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
-                                       AND NOT `contact`.`archive`
+                                       AND NOT `contact`.`self` AND NOT `contact`.`blocked`
                                WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_OSTATUS),
@@ -179,11 +205,12 @@ Class Cron {
                                $contact['last-update'] = NULL_DATE;
                        }
 
-                       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS))) {
+                       // Friendica and OStatus are checked once a day
+                       if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
                                $contact['priority'] = 2;
                        }
 
-                       if ($contact['subhub'] && in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS))) {
+                       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)
@@ -191,7 +218,17 @@ Class Cron {
                                 * 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);
+                               $contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3);
+                       }
+
+                       // Check Diaspora contacts or followers once a week
+                       if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+                               $contact['priority'] = 4;
+                       }
+
+                       // Check archived contacts once a month
+                       if ($contact['archive']) {
+                               $contact['priority'] = 5;
                        }
 
                        if (($contact['priority'] >= 0) && !$force) {
@@ -204,33 +241,33 @@ Class Cron {
                                 */
                                switch ($contact['priority']) {
                                        case 5:
-                                               if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 month")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 4:
-                                               if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 week")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 week")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 3:
-                                               if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 2:
-                                               if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 12 hour")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 12 hour")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 1:
-                                               if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 hour")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::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")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) {
                                                        $update = true;
                                                }
                                                break;
@@ -240,14 +277,17 @@ Class Cron {
                                }
                        }
 
-                       logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]);
-
                        if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) {
                                $priority = PRIORITY_MEDIUM;
+                       } elseif ($contact['archive']) {
+                               $priority = PRIORITY_NEGLIGIBLE;
                        } else {
                                $priority = PRIORITY_LOW;
                        }
-                       Worker::add(array('priority' => $priority, 'dont_fork' => true), 'OnePoll', (int)$contact['id']);
+
+                       logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
+
+                       Worker::add(['priority' => $priority, 'dont_fork' => true], 'OnePoll', (int)$contact['id']);
                }
        }
 }