X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=4e49dede8dae70bf48f1b18d7cf2c0b0d060a1f6;hb=d6a82c6c2d7befde9914fce3bd4e3e07b97ca036;hp=b6dd896cd77e9770c54354e62a92caeaee8f6ddc;hpb=14e7686df4250169de91c4db2912b1934cc4800f;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index b6dd896cd7..4e49dede8d 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)
@@ -37,15 +37,15 @@ class Cron
 		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");
+		Hook::fork($a->queue['priority'], "cron");
 
 		// run queue delivery process in the background
 		Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
@@ -123,7 +123,7 @@ class Cron
 		// Poll contacts
 		self::pollContacts($parameter, $generation);
 
-		logger('cron: end');
+		Logger::log('cron: end');
 
 		Config::set('system', 'last_cron', time());
 
@@ -133,25 +133,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 +165,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.
@@ -203,7 +200,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
@@ -286,9 +283,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']);
 		}
 	}
 }