clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5055 from annando/worker-spawning 

Fix for the slow spawning of workers
This commit is contained in:
Tobias Diekershoff 2018-05-15 08:22:33 +02:00 committed by GitHub
parent ba4f9b6136 f1b5e828db
commit 0848cef605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App.php
View File

@ -861,18 +861,6 @@ class App
return; return;
} }
// If the last worker fork was less than 2 seconds before then don't fork another one.
// This should prevent the forking of masses of workers.
$cachekey = 'app:proc_run:started';
$result = Cache::get($cachekey);
if (!is_null($result) && ( time() - $result) < 2) {
return;
}
// Set the timestamp of the last proc_run
Cache::set($cachekey, time(), CACHE_MINUTE);
array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php')); array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
for ($x = 0; $x < count($args); $x ++) { for ($x = 0; $x < count($args); $x ++) {

1
src/Core/Worker.php
View File

@ -999,6 +999,7 @@ class Worker
} }
/** /**
* @brief Spawns a new worker
* @return void * @return void
*/ */
public static function spawnWorker() public static function spawnWorker()