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

PHRAS-4057: log_doc - report mark as "cancel" for running_job entry (#4501)

Browse Source 
* log_docs mark as canceled too

* PHRAS-4058 auto cancelling job

* add auto-cancelingJob in hour in the config

* add patch rc12
This commit is contained in:
Aina Sitraka
2024-04-30 12:44:14 +03:00
committed by GitHub
parent 7e3fe51a2c
commit b0eba5217c
8 changed files with 157 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
View File

@@ -3,6 +3,7 @@
namespace Alchemy\Phrasea\WorkerManager\Controller;
use Alchemy\Phrasea\Application as PhraseaApplication;
use Alchemy\Phrasea\Application\Helper\DataboxLoggerAware;
use Alchemy\Phrasea\Controller\Controller;
use Alchemy\Phrasea\Model\Entities\WorkerRunningJob;
use Alchemy\Phrasea\Model\Repositories\WorkerRunningJobRepository;
@@ -32,6 +33,8 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
class AdminConfigurationController extends Controller
{
use DataboxLoggerAware;
public function indexAction(PhraseaApplication $app, Request $request)
{
return $this->render('admin/worker-manager/index.html.twig', [
@@ -223,8 +226,10 @@ class AdminConfigurationController extends Controller
$workerRunningJob = $repoWorker->find($workerId);
$workerRunningJob->setStatus($request->request->get('status'));
$finishedDate = new \DateTime('now');
if($request->request->get('finished') == '1') {
$workerRunningJob->setFinished(new \DateTime('now'))->setFlock(null);
$workerRunningJob->setFinished($finishedDate)->setFlock(null);
}
$em = $repoWorker->getEntityManager();
@@ -232,6 +237,10 @@ class AdminConfigurationController extends Controller
$em->flush();
if (in_array($workerRunningJob->getWork(), ['subdefCreation', 'writeMetadatas'])) {
$this->updateLogDocs($workerRunningJob, $workerRunningJob->getStatus(), $finishedDate);
}
return $this->app->json(['success' => true]);
}
@@ -250,8 +259,16 @@ class AdminConfigurationController extends Controller
{
/** @var WorkerRunningJobRepository $repoWorker */
$repoWorker = $this->app['repo.worker-running-job'];
$workerRunningJobs = $repoWorker->getRunningSinceCreated($request->request->get('hour'), ['subdefCreation', 'writeMetadatas']);
$repoWorker->updateStatusRunningToCanceledSinceCreated($request->request->get('hour'));
$finishedDate = new \DateTime('now');
/** @var WorkerRunningJob $workerRunningJob */
foreach ($workerRunningJobs as $workerRunningJob) {
$this->updateLogDocs($workerRunningJob, 'canceled', $finishedDate);
}
return $this->app->json(['success' => true]);
}
@@ -557,6 +574,17 @@ class AdminConfigurationController extends Controller
return $repoWorkerJob->checkPopulateStatusByDataboxIds($databoxIds);
}
private function updateLogDocs(WorkerRunningJob $workerRunningJob, $status, $finishedDate)
{
$databox = $this->findDataboxById($workerRunningJob->getDataboxId());
$record = $databox->get_record($workerRunningJob->getRecordId());
$subdefName = $workerRunningJob->getWorkOn();
$action = $workerRunningJob->getWork();
$this->getDataboxLogger($databox)->initOrUpdateLogDocsFromWorker($record, $databox, $workerRunningJob, $subdefName, $action, $finishedDate, $status);
}
private function getDefaultRecordsActionsSettings()
{
return <<<EOF