From ddb6bf0613d4dd2e85adef47849b8f4ceba1b283 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 14 Feb 2017 16:18:12 +0100
Subject: [PATCH] wait for process finish
---
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php | 5 +++--
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php | 7 ++++++-
src/Request/TTRequestImpl/TTRequestClass.php | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php b/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php
index ed610cd..0dbf24e 100644
--- a/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php
+++ b/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php
@@ -55,10 +55,11 @@ class IHMInputOutputTTClass implements InputOutputInterface
foreach ($data as $d)
{
+
+
if (!$d->getSuccess())
continue;
-
- //$res = $this->jobsManager->deleteJob($d->getId());
+
}
return $result;
diff --git a/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php b/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
index 33168c8..e33ce3b 100644
--- a/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
+++ b/src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
@@ -93,9 +93,14 @@ class IHMInputOutputTTClass implements InputOutputInterface
{
if ( $this->postProcessTT->compression ) {
+ $timeStart = time();
+
$cmd = $this->postProcessTT->getPostCmd();
system($cmd);
- sleep(1); // if immediately - raw files are not deleted (?)
+
+ while (!file_exists($this->postProcessTT->getOutputFileName()) && ( time() - $timeStart ) < KernelConfigClass::getTimeToBatchMode())
+ sleep(1);
+
foreach ($data as $d)
{
diff --git a/src/Request/TTRequestImpl/TTRequestClass.php b/src/Request/TTRequestImpl/TTRequestClass.php
index 5b37b62..ab86b28 100644
--- a/src/Request/TTRequestImpl/TTRequestClass.php
+++ b/src/Request/TTRequestImpl/TTRequestClass.php
@@ -72,8 +72,8 @@ class TTRequestClass extends RequestAbstractClass
return array("success" => false, "message" => "Cannot run the TT process");
//TBD
- while ($process->isRunning() && time() - $process->getRunningStart() > KernelConfigClass::getTimeToBatchMode()) {
- sleep(1);
+ while ($process->isRunning() && ( time() - $process->getRunningStart() ) < KernelConfigClass::getTimeToBatchMode()) {
+ sleep(1);
}
$result = array('success' => true);
--
libgit2 0.21.2