diff options
| author | Martin Ridgers <[email protected]> | 2021-11-15 09:10:39 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-15 09:10:39 +0100 |
| commit | b258c117aba04c6a672fb87d07d126449d961a73 (patch) | |
| tree | 174ccc6a674a173f417debd31a11d32348f042c6 /zenserver/upstream/upstreamapply.cpp | |
| parent | Fixed up FileSystemTranersal visitor to use std::fs::path (diff) | |
| parent | Updated cache policy according to UE. (diff) | |
| download | zen-b258c117aba04c6a672fb87d07d126449d961a73.tar.xz zen-b258c117aba04c6a672fb87d07d126449d961a73.zip | |
Merged main
Diffstat (limited to 'zenserver/upstream/upstreamapply.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamapply.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp index 19d02f753..3c67779c4 100644 --- a/zenserver/upstream/upstreamapply.cpp +++ b/zenserver/upstream/upstreamapply.cpp @@ -1157,8 +1157,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); @@ -1169,8 +1170,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)}; } |