aboutsummaryrefslogtreecommitdiff
path: root/zenserver/zenserver.cpp
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2021-09-28 15:09:15 +0200
committerPer Larsson <[email protected]>2021-09-28 15:09:15 +0200
commit141317786f9d59e95da8316ce40cf30e4dfd7b53 (patch)
tree3c863384c6ca68a30e82989994408c5f40159273 /zenserver/zenserver.cpp
parentRemoved using the bucket name to detect binary cache records and store conten... (diff)
parentapply: Re-enabled environment variable setup for child processes (diff)
downloadzen-141317786f9d59e95da8316ce40cf30e4dfd7b53.tar.xz
zen-141317786f9d59e95da8316ce40cf30e4dfd7b53.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver/zenserver.cpp')
-rw-r--r--zenserver/zenserver.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index fe4f41ab5..b45df9fef 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -261,6 +261,7 @@ public:
ZEN_INFO("NOT instantiating structured cache service");
}
+#if ZEN_ENABLE_MESH
if (ServiceConfig.MeshEnabled)
{
StartMesh(BasePort);
@@ -269,6 +270,7 @@ public:
{
ZEN_INFO("NOT starting mesh");
}
+#endif
m_Http = zen::CreateHttpServer();
m_Http->Initialize(BasePort);
@@ -302,11 +304,13 @@ public:
}
}
+#if ZEN_ENABLE_MESH
void StartMesh(int BasePort)
{
ZEN_INFO("initializing mesh discovery");
m_ZenMesh.Start(uint16_t(BasePort));
}
+#endif
void Run()
{