clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed code structure

This commit is contained in:
Michael 2022-05-20 04:42:10 +00:00
parent dc16e6d471
commit 6ce23bd9ca
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Worker/Cron.php
View File

@ -68,7 +68,6 @@ class Cron
*/ */
public static function killStaleWorkers() public static function killStaleWorkers()
{ {
$stamp = (float)microtime(true);
$entries = DBA::select( $entries = DBA::select(
'workerqueue', 'workerqueue',
['id', 'pid', 'executed', 'priority', 'command', 'parameter'], ['id', 'pid', 'executed', 'priority', 'command', 'parameter'],
@ -78,7 +77,6 @@ class Cron
while ($entry = DBA::fetch($entries)) { while ($entry = DBA::fetch($entries)) {
if (!posix_kill($entry["pid"], 0)) { if (!posix_kill($entry["pid"], 0)) {
$stamp = (float)microtime(true);
DBA::update( DBA::update(
'workerqueue', 'workerqueue',
['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['executed' => DBA::NULL_DATETIME, 'pid' => 0],
@ -89,7 +87,7 @@ class Cron
// Define the maximum durations // Define the maximum durations
$max_duration_defaults = [PRIORITY_CRITICAL => 720, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 720]; $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']];
$argv = json_decode($entry['parameter'], true); $argv = json_decode($entry['parameter'], true);
if (!empty($entry['command'])) { if (!empty($entry['command'])) {
@ -119,7 +117,6 @@ class Cron
} elseif ($entry['priority'] != PRIORITY_CRITICAL) { } elseif ($entry['priority'] != PRIORITY_CRITICAL) {
$new_priority = PRIORITY_NEGLIGIBLE; $new_priority = PRIORITY_NEGLIGIBLE;
} }
$stamp = (float)microtime(true);
DBA::update( DBA::update(
'workerqueue', 'workerqueue',
['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
@ -154,11 +151,11 @@ class Cron
DI::lock()->release(Worker::LOCK_PROCESS); DI::lock()->release(Worker::LOCK_PROCESS);
} }
} }
} }
/** /**
* Directly deliver AP messages or requeue them. * Directly deliver AP messages or requeue them.
* *
* This function is placed here as a safeguard. Even when the worker queue is completely blocked, messages will be delivered. * This function is placed here as a safeguard. Even when the worker queue is completely blocked, messages will be delivered.
*/ */
private static function deliverPosts() private static function deliverPosts()

6
src/Core/Worker/Daemon.php
View File

@ -70,7 +70,7 @@ class Daemon
return false; return false;
} }
$pid = intval(file_get_contents($pidfile)); $pid = intval(file_get_contents($pidfile));
$running = posix_kill($pid, 0); $running = posix_kill($pid, 0);
self::$daemon_mode = $running; self::$daemon_mode = $running;
@ -129,9 +129,7 @@ class Daemon
private static function spawn() private static function spawn()
{ {
Logger::notice('Starting new daemon process'); Logger::notice('Starting new daemon process');
$command = 'bin/daemon.php'; DI::system()->run('bin/daemon.php', ['start']);
$a = DI::app();
DI::system()->run($command, ['start']);
Logger::notice('New daemon process started'); Logger::notice('New daemon process started');
} }
} }

1
src/Core/Worker/IPC.php
View File

@ -62,7 +62,6 @@ class IPC
*/ */
public static function JobsExists(int $key = 0) public static function JobsExists(int $key = 0)
{ {
$stamp = (float)microtime(true);
$row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => $key]); $row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => $key]);
// When we don't have a row, no job is running // When we don't have a row, no job is running

2
src/Protocol/ActivityPub/Delivery.php
View File

@ -32,7 +32,7 @@ use Friendica\Worker\Delivery as WorkerDelivery;
class Delivery class Delivery
{ {
public static function deliver(string $inbox):array public static function deliver(string $inbox): array
{ {
$uri_ids = []; $uri_ids = [];
$posts = Post\Delivery::selectForInbox($inbox); $posts = Post\Delivery::selectForInbox($inbox);