X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=e523f75118af8ad0c415f2db2374a33f6ccf3799;hb=27d94023eef0263a3ce9750f79a73ac941a25304;hp=43c33103b3cf375f1798538cbc48d4b5c525686d;hpb=f41c891a6b255373d3bccc63c2e455a96ddaf0f8;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 43c33103b3..e523f75118 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,17 +4,19 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
+require_once 'include/dba.php';
+
 Class Cron {
 	public static function execute($parameter = '', $generation = 0) {
 		global $a;
 
-		require_once 'include/datetime.php';
-
 		// Poll contacts with specific parameters
 		if (!empty($parameter)) {
 			self::pollContacts($parameter, $generation);
@@ -38,6 +40,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");
 
@@ -67,7 +72,7 @@ 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'));
 
 		if ($d2 != intval($d1)) {
 
@@ -86,7 +91,7 @@ Class Cron {
 			Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums");
 
 			// 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 12 HOUR']);
 
 			// check upstream version?
 			Worker::add(PRIORITY_LOW, 'CheckVersion');
@@ -136,9 +141,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,17 +158,14 @@ 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`.`rel` IN (%d, %d) AND `contact`.`poll` != ''
+				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",
-			intval(CONTACT_IS_SHARING),
-			intval(CONTACT_IS_FRIEND),
 			dbesc(NETWORK_DFRN),
 			dbesc(NETWORK_OSTATUS),
 			dbesc(NETWORK_DIASPORA),
@@ -181,11 +183,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)
@@ -193,7 +196,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) {
@@ -206,33 +219,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;
@@ -242,14 +255,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']);
 		}
 	}
 }