Merge pull request #7169 from kaltura/Mercury-13.20.0-SUP-14485

SUP-14485:Use job createdAt instead of queued_time to decide on timeout
kaltura · May 23, 2018 · 87765a5 · 87765a5
2 parents a4bbb5b + f86d3cd
commit 87765a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/drop_folder/batch/Engine/KDropFolderFileTransferEngine.php b/plugins/drop_folder/batch/Engine/KDropFolderFileTransferEngine.php
@@ -510,7 +510,7 @@ private function addAsExistingContent(KalturaBatchJob $job, KalturaDropFolderCon
 			if(!$matchedEntry)
 			{
 				$e = new kTemporaryException('No matching entry found', KalturaDropFolderFileErrorCode::FILE_NO_MATCH);
-				if(($job->queueTime + KBatchBase::$taskConfig->params->maxTimeBeforeFail) >= time())	
+				if(($job->createdAt + KBatchBase::$taskConfig->params->maxTimeBeforeFail) >= time())
 				{
 					$e->setResetJobExecutionAttempts(true);
 				}