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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 61077ae734..f7377a6e71 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -7,14 +7,14 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 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)
@@ -30,25 +30,19 @@ 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);
 			if ($next > time()) {
-				logger('cron intervall not reached');
+				Logger::log('cron intervall not reached');
 				return;
 			}
 		}
 
-		logger('cron: start');
+		Logger::log('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");
+		Hook::fork($a->queue['priority'], "cron");
 
 		// run the process to discover global contacts in the background
 		Worker::add(PRIORITY_LOW, "DiscoverPoCo");
@@ -115,7 +109,7 @@ class Cron
 
 		// Ensure to have a .htaccess file.
 		// this is a precaution for systems that update automatically
-		$basepath = $a->get_basepath();
+		$basepath = $a->getBasePath();
 		if (!file_exists($basepath . '/.htaccess')) {
 			copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
 		}
@@ -123,7 +117,7 @@ class Cron
 		// Poll contacts
 		self::pollContacts($parameter, $generation);
 
-		logger('cron: end');
+		Logger::log('cron: end');
 
 		Config::set('system', 'last_cron', time());
 
@@ -133,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();
 			}
 		}
 
@@ -166,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.
@@ -186,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),
@@ -203,7 +195,7 @@ class Cron
 		foreach ($contacts as $contact) {
 
 			if ($manual_id) {
-				$contact['last-update'] = NULL_DATE;
+				$contact['last-update'] = DBA::NULL_DATETIME;
 			}
 
 			// Friendica and OStatus are checked once a day
@@ -222,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;
 			}
 
@@ -286,9 +278,9 @@ class Cron
 				$priority = PRIORITY_LOW;
 			}
 
-			logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
+			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']);
 		}
 	}
 }