mirror of
https://github.com/friendica/friendica
synced 2025-01-25 22:59:46 +00:00
Simplified the code
This commit is contained in:
parent
f9152ce140
commit
069786cd7f
1 changed files with 23 additions and 29 deletions
|
@ -943,8 +943,7 @@ class Worker
|
|||
|
||||
if (DI::config()->get('system', 'worker_multiple_fetch')) {
|
||||
$pids = [];
|
||||
$worker_pids = self::getWorkerPIDList();
|
||||
foreach ($worker_pids as $pid => $count) {
|
||||
foreach (self::getWorkerPIDList() as $pid => $count) {
|
||||
if ($count <= $fetch_limit) {
|
||||
$pids[] = $pid;
|
||||
}
|
||||
|
@ -979,7 +978,11 @@ class Worker
|
|||
DBA::close($tasks);
|
||||
}
|
||||
|
||||
if (!empty($ids)) {
|
||||
if (empty($ids)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Assign the task ids to the workers
|
||||
$worker = [];
|
||||
foreach (array_unique($ids) as $id) {
|
||||
$pid = next($pids);
|
||||
|
@ -999,9 +1002,6 @@ class Worker
|
|||
self::$db_duration_write += (microtime(true) - $stamp);
|
||||
}
|
||||
|
||||
return !empty($ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the next worker process
|
||||
*
|
||||
|
@ -1022,17 +1022,11 @@ class Worker
|
|||
}
|
||||
self::$lock_duration += (microtime(true) - $stamp);
|
||||
|
||||
$found = self::findWorkerProcesses();
|
||||
self::findWorkerProcesses();
|
||||
|
||||
DI::lock()->release(self::LOCK_PROCESS);
|
||||
|
||||
if ($found) {
|
||||
$stamp = (float)microtime(true);
|
||||
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
|
||||
self::$db_duration += (microtime(true) - $stamp);
|
||||
return DBA::toArray($r);
|
||||
}
|
||||
return false;
|
||||
return self::getWaitingJobForPID();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue