aboutsummaryrefslogtreecommitdiff
path: root/zenserver/compute/apply.h
diff options
context:
space:
mode:
authorJoe Kirchoff <[email protected]>2021-12-01 14:30:25 -0800
committerJoe Kirchoff <[email protected]>2021-12-01 14:30:25 -0800
commitdda7198685d66f64926eb942748df57dca765833 (patch)
treea3e4ca6d18d6d063e99613bbd681440f6127fabf /zenserver/compute/apply.h
parentMerge pull request #31 from EpicGames/non-elevated-asio (diff)
downloadzen-dda7198685d66f64926eb942748df57dca765833.tar.xz
zen-dda7198685d66f64926eb942748df57dca765833.zip
Don't throw a runtime_error if remote execute api fails
asio currently doesn't propagate the exception as a 500 error
Diffstat (limited to 'zenserver/compute/apply.h')
-rw-r--r--zenserver/compute/apply.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h
index 15cda4750..0d6edf119 100644
--- a/zenserver/compute/apply.h
+++ b/zenserver/compute/apply.h
@@ -46,7 +46,7 @@ private:
[[nodiscard]] std::filesystem::path CreateNewSandbox();
[[nodiscard]] CbPackage ExecAction(const WorkerDesc& Worker, CbObject Action);
- [[nodiscard]] CbObject ExecActionUpstream(const WorkerDesc& Worker, CbObject Action);
+ [[nodiscard]] HttpResponseCode ExecActionUpstream(const WorkerDesc& Worker, CbObject Action, CbObject& Object);
[[nodiscard]] HttpResponseCode ExecActionUpstreamResult(const IoHash& WorkerId, const IoHash& ActionId, CbPackage& Package);
RwLock m_WorkerLock;