nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5481 from annando/issue-5467

Browse source 
Issue 5467: Fix worker and daemon
This commit is contained in:
Tobias Diekershoff 2018-07-24 06:27:05 +02:00 committed by GitHub
commit f2b97f9320
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/daemon.php
View file

@ -13,9 +13,8 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
// Get options // Get options
$shortopts = ''; $shortopts = 'f';
$shortopts .= 'f'; $longopts = ['foreground'];
$longopts = [ 'foreground' ];
$options = getopt($shortopts, $longopts); $options = getopt($shortopts, $longopts);
// Ensure that daemon.php is executed from the base path of the installation // Ensure that daemon.php is executed from the base path of the installation

5
bin/worker.php
View file

@ -11,9 +11,8 @@ use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
// Get options // Get options
$shortopts = ''; $shortopts = 'sc';
$shortopts .= 'sc'; $longopts = ['spawn', 'cron'];
$longopts = [ 'spawn', 'cron' ];
$options = getopt($shortopts, $longopts); $options = getopt($shortopts, $longopts);
// Ensure that worker.php is executed from the base path of the installation // Ensure that worker.php is executed from the base path of the installation

4
src/App.php
View file

@ -1127,7 +1127,7 @@ class App
return; return;
} }
$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . $command; $cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
foreach ($args as $key => $value) { foreach ($args as $key => $value) {
if (!is_null($value) && is_bool($value) && !$value) { if (!is_null($value) && is_bool($value) && !$value) {
@ -1140,8 +1140,6 @@ class App
} }
} }
$cmdline = escapeshellarg($cmdline);
if ($this->min_memory_reached()) { if ($this->min_memory_reached()) {
return; return;
} }