Browse Source

Issue 5467: Fix worker and daemon

tags/2018.09
Michael 2 years ago
parent
commit
de984cdaa1
2 changed files with 3 additions and 6 deletions
  1. +2
    -3
      bin/daemon.php
  2. +1
    -3
      src/App.php

+ 2
- 3
bin/daemon.php View File

@@ -13,9 +13,8 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA;

// Get options
$shortopts = '';
$shortopts .= 'f';
$longopts = [ 'foreground' ];
$shortopts = 'f';
$longopts = ['foreground'];
$options = getopt($shortopts, $longopts);

// Ensure that daemon.php is executed from the base path of the installation


+ 1
- 3
src/App.php View File

@@ -1127,7 +1127,7 @@ class App
return;
}

$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . $command;
$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . escapeshellarg($command);

foreach ($args as $key => $value) {
if (!is_null($value) && is_bool($value) && !$value) {
@@ -1140,8 +1140,6 @@ class App
}
}

$cmdline = escapeshellarg($cmdline);

if ($this->min_memory_reached()) {
return;
}


Loading…
Cancel
Save