hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
This commit is contained in:
Romain Neutron
2013-10-18 15:01:47 +02:00
parent c28019adb4 a0aa9cc97f
commit 0fa375b9bc
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/task/Scheduler.php
View File

@@ -372,7 +372,14 @@ class task_Scheduler
);
if (is_resource($taskPoll[$tkey]["process"])) {
$this->sleep(2);
// let the process lock and write it's pid
$sleepTimeout = microtime(true) + 10;
do {
usleep(500000);
if (null !== $taskPoll[$tkey]['task']->getPID()) {
break;
}
} while (microtime(true) < $sleepTimeout);
}
if (is_resource($taskPoll[$tkey]["process"]) && ($pid = $taskPoll[$tkey]['task']->getPID()) !== null) {