*/
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\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat;
-use dba;
-
-require_once 'include/dba.php';
class Cron
{
public static function execute($parameter = '', $generation = 0)
{
- $a = \Friendica\BaseObject::getApp();
+ $a = BaseObject::getApp();
// Poll contacts with specific parameters
if (!empty($parameter)) {
$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");
if (Config::get('system', 'last_cron_hourly', 0) + 3600 < time()) {
// Delete all done workerqueue entries
- dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
+ DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
// Optimizing this table only last seconds
if (Config::get('system', 'optimize_workerqueue', false)) {
- dba::e("OPTIMIZE TABLE `workerqueue`");
+ 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->getBasePath();
+ if (!file_exists($basepath . '/.htaccess')) {
+ copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
+ }
+
// Poll contacts
self::pollContacts($parameter, $generation);
- logger('cron: end');
+ Logger::log('cron: end');
Config::set('system', 'last_cron', time());
/**
* @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();
}
}
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.
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",
- dbesc(NETWORK_DFRN),
- dbesc(NETWORK_OSTATUS),
- dbesc(NETWORK_DIASPORA),
- dbesc(NETWORK_FEED),
- dbesc(NETWORK_MAIL)
+ DBA::escape(Protocol::ACTIVITYPUB),
+ DBA::escape(Protocol::DFRN),
+ DBA::escape(Protocol::OSTATUS),
+ DBA::escape(Protocol::DIASPORA),
+ DBA::escape(Protocol::FEED),
+ DBA::escape(Protocol::MAIL)
);
- if (!DBM::is_result($contacts)) {
+ if (!DBA::isResult($contacts)) {
return;
}
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
- if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+ if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
$contact['priority'] = 2;
}
- if ($contact['subhub'] && in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+ if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::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)
$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)) {
+ // 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;
}
}
}
- if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) {
+ if (($contact['network'] == Protocol::FEED) && ($contact['priority'] <= 3)) {
$priority = PRIORITY_MEDIUM;
} elseif ($contact['archive']) {
$priority = PRIORITY_NEGLIGIBLE;
$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']);
}
}
}
projects / friendica.git / blobdiff