Remote Apply: Get Expire timeout from worker

1 files changed, 5 insertions, 4 deletions

diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp
index fd24d241c..3f1b0d8f9 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/zenserver/upstream/upstreamapply.cpp
@@ -1154,8 +1154,9 @@ public:
 	{
 		if (m_RunState.IsRunning)
 		{
-			const IoHash WorkerId = ApplyRecord.WorkerDescriptor.GetHash();
-			const IoHash ActionId = ApplyRecord.Action.GetHash();
+			const IoHash   WorkerId		  = ApplyRecord.WorkerDescriptor.GetHash();
+			const IoHash   ActionId		  = ApplyRecord.Action.GetHash();
+			const uint32_t TimeoutSeconds = ApplyRecord.WorkerDescriptor["timeout"sv].AsInt32(300);
 
 			{
 				std::scoped_lock Lock(m_ApplyTasksMutex);
@@ -1166,8 +1167,8 @@ public:
 				}
 
 				std::chrono::steady_clock::time_point ExpireTime =
-					ApplyRecord.ExpireSeconds > 0 ? std::chrono::steady_clock::now() + std::chrono::seconds(ApplyRecord.ExpireSeconds)
-												  : std::chrono::steady_clock::time_point::max();
+					TimeoutSeconds > 0 ? std::chrono::steady_clock::now() + std::chrono::seconds(TimeoutSeconds)
+									   : std::chrono::steady_clock::time_point::max();
 
 				m_ApplyTasks[WorkerId][ActionId] = {.State = UpstreamApplyState::Queued, .Result{}, .ExpireTime = std::move(ExpireTime)};
 			}