use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Model\Contact;
use Friendica\Model\Post;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
/**
* Contains the class for jobs that are executed in an interval
Logger::info('Add cron entries');
// Check for spooled items
- Worker::add(['priority' => PRIORITY_HIGH, 'force_priority' => true], 'SpoolPost');
+ Worker::add(['priority' => Worker::PRIORITY_HIGH, 'force_priority' => true], 'SpoolPost');
// Run the cron job that calls all other jobs
- Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], 'Cron');
+ Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'Cron');
// Cleaning dead processes
self::killStaleWorkers();
['order' => ['priority', 'retrial', 'created']]
);
+ $max_duration_defaults = DI::config()->get('system', 'worker_max_duration');
+
while ($entry = DBA::fetch($entries)) {
if (!posix_kill($entry["pid"], 0)) {
- DBA::update(
- 'workerqueue',
- ['executed' => DBA::NULL_DATETIME, 'pid' => 0],
- ['id' => $entry["id"]]
- );
+ DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['id' => $entry["id"]]);
} else {
// Kill long running processes
// Define the maximum durations
- $max_duration_defaults = [PRIORITY_CRITICAL => 720, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 720];
- $max_duration = $max_duration_defaults[$entry['priority']];
+ $max_duration = $max_duration_defaults[$entry['priority']] ?? 0;
+ if (empty($max_duration)) {
+ continue;
+ }
$argv = json_decode($entry['parameter'], true);
if (!empty($entry['command'])) {
// How long is the process already running?
$duration = (time() - strtotime($entry["executed"])) / 60;
if ($duration > $max_duration) {
- Logger::notice('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
+ Logger::warning('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
posix_kill($entry["pid"], SIGTERM);
// We killed the stale process.
// To avoid a blocking situation we reschedule the process at the beginning of the queue.
// Additionally we are lowering the priority. (But not PRIORITY_CRITICAL)
$new_priority = $entry['priority'];
- if ($entry['priority'] == PRIORITY_HIGH) {
- $new_priority = PRIORITY_MEDIUM;
- } elseif ($entry['priority'] == PRIORITY_MEDIUM) {
- $new_priority = PRIORITY_LOW;
- } elseif ($entry['priority'] != PRIORITY_CRITICAL) {
- $new_priority = PRIORITY_NEGLIGIBLE;
+ if ($entry['priority'] == Worker::PRIORITY_HIGH) {
+ $new_priority = Worker::PRIORITY_MEDIUM;
+ } elseif ($entry['priority'] == Worker::PRIORITY_MEDIUM) {
+ $new_priority = Worker::PRIORITY_LOW;
+ } elseif ($entry['priority'] != Worker::PRIORITY_CRITICAL) {
+ $new_priority = Worker::PRIORITY_NEGLIGIBLE;
}
- DBA::update(
- 'workerqueue',
- ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
- ['id' => $entry["id"]]
+ DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], ['id' => $entry["id"]]
);
} else {
Logger::info('Process runtime is okay', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
while ($delivery = DBA::fetch($deliveries)) {
if ($delivery['failed'] == 0) {
$result = ActivityPub\Delivery::deliver($delivery['inbox']);
- Logger::info('Drectly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
+ Logger::info('Directly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
continue;
} elseif ($delivery['failed'] < 3) {
- $priority = PRIORITY_HIGH;
+ $priority = Worker::PRIORITY_HIGH;
} elseif ($delivery['failed'] < 6) {
- $priority = PRIORITY_MEDIUM;
+ $priority = Worker::PRIORITY_MEDIUM;
} elseif ($delivery['failed'] < 8) {
- $priority = PRIORITY_LOW;
- } {
- $priority = PRIORITY_NEGLIGIBLE;
+ $priority = Worker::PRIORITY_LOW;
+ } else {
+ $priority = Worker::PRIORITY_NEGLIGIBLE;
}
if ($delivery['failed'] >= DI::config()->get('system', 'worker_defer_limit')) {
}
}
}
+
+ /**
+ * Add missing "intro" records.
+ *
+ * @return void
+ */
+ private static function addIntros()
+ {
+ $contacts = DBA::p("SELECT `uid`, `id`, `created` FROM `contact` WHERE `rel` = ? AND `pending` AND NOT `id` IN (SELECT `contact-id` FROM `intro`)", Contact::FOLLOWER);
+ while ($contact = DBA::fetch($contacts)) {
+ $fields = [
+ 'uid' => $contact['uid'],
+ 'contact-id' => $contact['id'],
+ 'datetime' => $contact['created'],
+ 'hash' => Strings::getRandomHex()
+ ];
+ Logger::notice('Adding missing intro', ['fields' => $fields]);
+ DBA::insert('intro', $fields);
+ }
+ }
}