X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=f7377a6e7199f4eba5995015bbffdac4be4bb974;hb=a85aa24d56e0aa0217529aaad9829ec6e7a2bc2e;hp=9b8eb1cfec8b11aa1be350f7522cf350b60193c7;hpb=2f28c2ebbfd8f66093d7081d40b1d48f65fcff20;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 9b8eb1cfec..f7377a6e71 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -15,8 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Cron
 {
 	public static function execute($parameter = '', $generation = 0)
@@ -32,9 +30,6 @@ class Cron
 		$last = Config::get('system', 'last_cron');
 
 		$poll_interval = intval(Config::get('system', 'cron_interval'));
-		if (! $poll_interval) {
-			$poll_interval = 10;
-		}
 
 		if ($last) {
 			$next = $last + ($poll_interval * 60);
@@ -49,9 +44,6 @@ class Cron
 		// Fork the cron jobs in separate parts to avoid problems when one of them is crashing
 		Hook::fork($a->queue['priority'], "cron");
 
-		// run queue delivery process in the background
-		Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
-
 		// run the process to discover global contacts in the background
 		Worker::add(PRIORITY_LOW, "DiscoverPoCo");
 
@@ -135,25 +127,24 @@ class Cron
 	/**
 	 * @brief Poll contacts for unreceived messages
 	 *
-	 * @todo Currently it seems as if the following parameter aren't used at all ...
+	 * @todo  Currently it seems as if the following parameter aren't used at all ...
 	 *
-	 * @param string $parameter Parameter (force, restart, ...) for the contact polling
+	 * @param string  $parameter Parameter (force, restart, ...) for the contact polling
 	 * @param integer $generation
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function pollContacts($parameter, $generation) {
 		$manual_id  = 0;
 		$generation = 0;
 		$force      = false;
-		$restart    = false;
 
 		if ($parameter == 'force') {
 			$force = true;
 		}
 		if ($parameter == 'restart') {
-			$restart = true;
 			$generation = intval($generation);
 			if (!$generation) {
-				killme();
+				exit();
 			}
 		}
 
@@ -168,8 +159,6 @@ class Cron
 
 		Addon::reload();
 
-		$d = DateTimeFormat::utcNow();
-
 		// Only poll from those with suitable relationships,
 		// and which have a polling address and ignore Diaspora since
 		// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
@@ -188,9 +177,10 @@ class Cron
 				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 `contact`.`network` IN ('%s', '%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(Protocol::ACTIVITYPUB),
 			DBA::escape(Protocol::DFRN),
 			DBA::escape(Protocol::OSTATUS),
 			DBA::escape(Protocol::DIASPORA),
@@ -224,8 +214,8 @@ class Cron
 				$contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3);
 			}
 
-			// Check Diaspora contacts or followers once a week
-			if (($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
+			// Check ActivityPub and Diaspora contacts or followers once a week
+			if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DIASPORA]) || ($contact["rel"] == Contact::FOLLOWER)) {
 				$contact['priority'] = 4;
 			}
 
@@ -290,7 +280,7 @@ class Cron
 
 			Logger::log("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
 
-			Worker::add(['priority' => $priority, 'dont_fork' => true], 'OnePoll', (int)$contact['id']);
+			Worker::add(['priority' => $priority, 'dont_fork' => true, 'force_priority' => true], 'OnePoll', (int)$contact['id']);
 		}
 	}
 }