diff options
| author | Stefan Boberg <[email protected]> | 2023-01-26 10:02:16 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-01-26 10:02:16 +0100 |
| commit | 283ef719ac57339f9338765bf2013ee110897396 (patch) | |
| tree | 1d61eb02327edbc693c9907b7a14b3f2b6fb2aaf /zenserver/zenserver.cpp | |
| parent | removed experimental mesh code (diff) | |
| parent | Fixed macro leaking out (diff) | |
| download | zen-283ef719ac57339f9338765bf2013ee110897396.tar.xz zen-283ef719ac57339f9338765bf2013ee110897396.zip | |
merge
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index c1e82f404..526e27152 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -105,13 +105,11 @@ ZEN_THIRD_PARTY_INCLUDES_END #include "cidstore.h" #include "compute/function.h" #include "diag/diagsvcs.h" -#include "experimental/usnjournal.h" #include "frontend/frontend.h" #include "monitoring/httpstats.h" #include "monitoring/httpstatus.h" #include "projectstore.h" #include "testing/httptest.h" -#include "testing/launch.h" #include "upstream/upstream.h" #include "zenstore/gc.h" @@ -266,23 +264,6 @@ public: m_ProjectStore = new zen::ProjectStore(*m_CidStore, m_DataRoot / "projects", m_GcManager); m_HttpProjectService.reset(new zen::HttpProjectService{*m_CidStore, m_ProjectStore}); -#if ZEN_WITH_EXEC_SERVICES - - if (ServerOptions.ExecServiceEnabled) - { - ZEN_INFO("instantiating exec service"); - - std::filesystem::path SandboxDir = m_DataRoot / "exec" / "sandbox"; - zen::CreateDirectories(SandboxDir); - m_HttpLaunchService = std::make_unique<zen::HttpLaunchService>(*m_CidStore, SandboxDir); - } - else - { - ZEN_INFO("NOT instantiating exec services"); - } - -#endif // ZEN_WITH_EXEC_SERVICES - #if ZEN_WITH_COMPUTE_SERVICES if (ServerOptions.ComputeServiceEnabled) { @@ -319,15 +300,6 @@ public: m_Http->RegisterService(*m_CidService); -#if ZEN_WITH_EXEC_SERVICES - if (ServerOptions.ExecServiceEnabled) - { - if (m_HttpLaunchService != nullptr) - { - m_Http->RegisterService(*m_HttpLaunchService); - } - } -#endif // ZEN_WITH_EXEC_SERVICES #if ZEN_WITH_COMPUTE_SERVICES if (ServerOptions.ComputeServiceEnabled) { @@ -592,9 +564,6 @@ private: std::unique_ptr<zen::HttpStructuredCacheService> m_StructuredCacheService; zen::HttpAdminService m_AdminService{m_GcScheduler}; zen::HttpHealthService m_HealthService; -#if ZEN_WITH_EXEC_SERVICES - std::unique_ptr<zen::HttpLaunchService> m_HttpLaunchService; -#endif // ZEN_WITH_EXEC_SERVICES #if ZEN_WITH_COMPUTE_SERVICES std::unique_ptr<zen::HttpFunctionService> m_HttpFunctionService; #endif // ZEN_WITH_COMPUTE_SERVICES |