Rename dbesc to DBA::escape

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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index e9019216f5b5a798e42197154ca259bb559063dc..b28c4216198e454c5cafe998435b2c0949481dfa 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,18 +4,20 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/dba.php';
 
-Class Cron {
-       public static function execute($parameter = '', $generation = 0) {
-               global $a;
-
-               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)) {
@@ -40,6 +42,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");
 
@@ -55,9 +60,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");
 
@@ -69,29 +71,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', ['`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
@@ -138,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
@@ -163,14 +187,14 @@ Class Cron {
                                        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",
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_DIASPORA),
-                       dbesc(NETWORK_FEED),
-                       dbesc(NETWORK_MAIL)
+                       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;
                }
 
@@ -216,33 +240,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;