keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed worker config stuff

Browse source
This commit is contained in:
Michael 2017-02-26 23:27:10 +00:00
parent 733caa5669
commit 46308fa1ef
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boot.php
View file

@ -1386,7 +1386,6 @@ class App {
// If the last worker fork was less than 10 seconds before then don't fork another one. // If the last worker fork was less than 10 seconds before then don't fork another one.
// This should prevent the forking of masses of workers. // This should prevent the forking of masses of workers.
if (get_config("system", "worker")) {
$cachekey = "app:proc_run:started"; $cachekey = "app:proc_run:started";
$result = Cache::get($cachekey); $result = Cache::get($cachekey);
if (!is_null($result)) { if (!is_null($result)) {
@ -1396,7 +1395,6 @@ class App {
} }
// Set the timestamp of the last proc_run // Set the timestamp of the last proc_run
Cache::set($cachekey, time(), CACHE_MINUTE); Cache::set($cachekey, time(), CACHE_MINUTE);
}
$args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'); $args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
} }
@ -2000,7 +1998,8 @@ function proc_run($cmd){
if (!$arr['run_cmd'] OR !count($args)) if (!$arr['run_cmd'] OR !count($args))
return; return;
if (!get_config("system", "worker") OR (is_string($run_parameter) AND ($run_parameter != 'php'))) { /// @todo I guess we can remove it, since we don't call it with something different
if (is_string($run_parameter) AND ($run_parameter != 'php')) {
$a->proc_run($args); $a->proc_run($args);
return; return;
} }