diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php index b07c472750..da9e16d42f 100644 --- a/src/Core/Worker/Cron.php +++ b/src/Core/Worker/Cron.php @@ -68,7 +68,6 @@ class Cron */ public static function killStaleWorkers() { - $stamp = (float)microtime(true); $entries = DBA::select( 'workerqueue', ['id', 'pid', 'executed', 'priority', 'command', 'parameter'], @@ -78,7 +77,6 @@ class Cron while ($entry = DBA::fetch($entries)) { if (!posix_kill($entry["pid"], 0)) { - $stamp = (float)microtime(true); DBA::update( 'workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], @@ -89,7 +87,7 @@ class Cron // 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']]; $argv = json_decode($entry['parameter'], true); if (!empty($entry['command'])) { @@ -119,7 +117,6 @@ class Cron } elseif ($entry['priority'] != PRIORITY_CRITICAL) { $new_priority = PRIORITY_NEGLIGIBLE; } - $stamp = (float)microtime(true); DBA::update( 'workerqueue', ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], @@ -154,11 +151,11 @@ class Cron DI::lock()->release(Worker::LOCK_PROCESS); } } - } + } /** * 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. */ private static function deliverPosts() diff --git a/src/Core/Worker/Daemon.php b/src/Core/Worker/Daemon.php index afc6cda4ec..02c37d3b0d 100644 --- a/src/Core/Worker/Daemon.php +++ b/src/Core/Worker/Daemon.php @@ -70,7 +70,7 @@ class Daemon return false; } - $pid = intval(file_get_contents($pidfile)); + $pid = intval(file_get_contents($pidfile)); $running = posix_kill($pid, 0); self::$daemon_mode = $running; @@ -129,9 +129,7 @@ class Daemon private static function spawn() { Logger::notice('Starting new daemon process'); - $command = 'bin/daemon.php'; - $a = DI::app(); - DI::system()->run($command, ['start']); + DI::system()->run('bin/daemon.php', ['start']); Logger::notice('New daemon process started'); } } diff --git a/src/Core/Worker/IPC.php b/src/Core/Worker/IPC.php index a10cf1cd0c..0da63b8b88 100644 --- a/src/Core/Worker/IPC.php +++ b/src/Core/Worker/IPC.php @@ -62,7 +62,6 @@ class IPC */ public static function JobsExists(int $key = 0) { - $stamp = (float)microtime(true); $row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => $key]); // When we don't have a row, no job is running diff --git a/src/Protocol/ActivityPub/Delivery.php b/src/Protocol/ActivityPub/Delivery.php index 29fe21dd06..2a2a63fee1 100644 --- a/src/Protocol/ActivityPub/Delivery.php +++ b/src/Protocol/ActivityPub/Delivery.php @@ -32,7 +32,7 @@ use Friendica\Worker\Delivery as WorkerDelivery; class Delivery { - public static function deliver(string $inbox):array + public static function deliver(string $inbox): array { $uri_ids = []; $posts = Post\Delivery::selectForInbox($inbox);