From e9dabaaa4106b120de6381791c343ebd301b8081 Mon Sep 17 00:00:00 2001 From: aina esokia Date: Tue, 20 Oct 2020 15:57:46 +0300 Subject: [PATCH] fix job status #time 1h --- .../Phrasea/Model/Repositories/WorkerRunningJobRepository.php | 4 ++-- .../WorkerManager/Controller/AdminConfigurationController.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php index f56c8025ec..c37c58bc3c 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php @@ -85,8 +85,8 @@ class WorkerRunningJobRepository extends EntityRepository $qb = $this->createQueryBuilder('w'); $qb->where($qb->expr()->in('w.databoxId', $databoxIds)) ->andWhere('w.work = :work') - ->andWhere('w.status != :status') - ->setParameters([ 'work' => MessagePublisher::POPULATE_INDEX_TYPE, 'status' => WorkerRunningJob::FINISHED]) + ->andWhere('w.status = :status') + ->setParameters([ 'work' => MessagePublisher::POPULATE_INDEX_TYPE, 'status' => WorkerRunningJob::RUNNING]) ; return count($qb->getQuery()->getResult()); diff --git a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php index 9232403819..f894d1cb98 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php @@ -102,7 +102,9 @@ class AdminConfigurationController extends Controller /** * @param Request $request - * @param integer $workerId + * @param $workerId + * @return \Symfony\Component\HttpFoundation\JsonResponse + * @throws \Doctrine\ORM\OptimisticLockException */ public function changeStatusAction(Request $request, $workerId) {