Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-01-10 18:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt run-command for console.php executions

Browse source
This commit is contained in:
Philipp 2025-01-02 20:53:16 +01:00
parent c79f0c83a7
commit eb0c38f90f
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Core/System.php
View file

@ -164,9 +164,10 @@ class System
* Executes a child process with 'proc_open'
*
* @param string $command The command to execute
* @param array $args Arguments to pass to the command ( [ 'key' => value, 'key2' => value2, ... ]
* @param array $args Arguments to pass to the command ( ['arg1', 'arg2', ... ] )
* @param array $options Options to pass to the command ( [ 'key' => value, 'key2' => value2, ... ]
*/
public function run(string $command, array $args)
public function run(string $command, array $args = [], array $options = [])
{
if (!function_exists('proc_open')) {
$this->logger->warning('"proc_open" not available - quitting');
@ -175,7 +176,11 @@ class System
$cmdline = $this->config->get('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
foreach ($args as $key => $value) {
foreach ($args as $argumment) {
$cmdline .= ' ' . $argumment;
}
foreach ($options as $key => $value) {
if (!is_null($value) && is_bool($value) && !$value) {
continue;
}

2
src/Core/Worker.php
View file

@ -1207,7 +1207,7 @@ class Worker
if (Worker\Daemon::isMode() && DI::config()->get('system', 'worker_fork')) {
self::forkProcess($do_cron);
} else {
DI::system()->run('bin/console.php worker', ['no_cron' => !$do_cron]);
DI::system()->run('bin/console.php', ['worker'], ['no_cron' => !$do_cron]);
}
if (Worker\Daemon::isMode()) {
Worker\IPC::SetJobState(false);

2
src/Core/Worker/Daemon.php
View file

@ -115,7 +115,7 @@ class Daemon
private static function spawn()
{
Logger::notice('Starting new daemon process');
DI::system()->run('bin/console.php daemon', ['start']);
DI::system()->run('bin/console.php', ['start']);
Logger::notice('New daemon process started');
}
}