CDPP / AMDA_Integration

Commit ddb6bf0613d4dd2e85adef47849b8f4ceba1b283

Authored by Elena.Budnik
1 parent 0b6b2080
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

wait for process finish

Showing 3 changed files with 11 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php
  Diff comments   View file @ddb6bf0
@@ -55,10 +55,11 @@ class IHMInputOutputTTClass implements InputOutputInterface @@ -55,10 +55,11 @@ class IHMInputOutputTTClass implements InputOutputInterface
55 55
56 foreach ($data as $d) 56 foreach ($data as $d)
57 { 57 {
  58 +
  59 +
58 if (!$d->getSuccess()) 60 if (!$d->getSuccess())
59 continue; 61 continue;
60 -  
61 - //$res = $this->jobsManager->deleteJob($d->getId()); 62 +
62 } 63 }
63 64
64 return $result; 65 return $result;
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
  Diff comments   View file @ddb6bf0
@@ -93,9 +93,14 @@ class IHMInputOutputTTClass implements InputOutputInterface @@ -93,9 +93,14 @@ class IHMInputOutputTTClass implements InputOutputInterface
93 { 93 {
94 if ( $this->postProcessTT->compression ) { 94 if ( $this->postProcessTT->compression ) {
95 95
  96 + $timeStart = time();
  97 +
96 $cmd = $this->postProcessTT->getPostCmd(); 98 $cmd = $this->postProcessTT->getPostCmd();
97 system($cmd); 99 system($cmd);
98 - sleep(1); // if immediately - raw files are not deleted (?) 100 +
  101 + while (!file_exists($this->postProcessTT->getOutputFileName()) && ( time() - $timeStart ) < KernelConfigClass::getTimeToBatchMode())
  102 + sleep(1);
  103 +
99 104
100 foreach ($data as $d) 105 foreach ($data as $d)
101 { 106 {
src/Request/TTRequestImpl/TTRequestClass.php
  Diff comments   View file @ddb6bf0
@@ -72,8 +72,8 @@ class TTRequestClass extends RequestAbstractClass @@ -72,8 +72,8 @@ class TTRequestClass extends RequestAbstractClass
72 return array("success" => false, "message" => "Cannot run the TT process"); 72 return array("success" => false, "message" => "Cannot run the TT process");
73 73
74 //TBD 74 //TBD
75 - while ($process->isRunning() && time() - $process->getRunningStart() > KernelConfigClass::getTimeToBatchMode()) {  
76 - sleep(1); 75 + while ($process->isRunning() && ( time() - $process->getRunningStart() ) < KernelConfigClass::getTimeToBatchMode()) {
  76 + sleep(1);
77 } 77 }
78 78
79 $result = array('success' => true); 79 $result = array('success' => true);