aboutsummaryrefslogtreecommitdiff
path: root/zenserver/zenserver.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2022-06-03 10:08:22 +0200
committerStefan Boberg <[email protected]>2022-06-03 10:08:22 +0200
commit91e2573a1fdebc1c3cbbbc5d5f9be3b6f540463b (patch)
tree2bf98fe4a1dfa20bace298d0f51b1a2d8b9a7217 /zenserver/zenserver.cpp
parentMerge branch 'main' into use-catch2 (diff)
parentmove release job to in-house linux agent (diff)
downloadzen-91e2573a1fdebc1c3cbbbc5d5f9be3b6f540463b.tar.xz
zen-91e2573a1fdebc1c3cbbbc5d5f9be3b6f540463b.zip
merge from main
Diffstat (limited to 'zenserver/zenserver.cpp')
-rw-r--r--zenserver/zenserver.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 53a046f80..4db69c265 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -364,6 +364,7 @@ public:
ZEN_INFO("initializing GC, enabled '{}', interval {}s", ServerOptions.GcConfig.Enabled, ServerOptions.GcConfig.IntervalSeconds);
zen::GcSchedulerConfig GcConfig{
.RootDirectory = m_DataRoot / "gc",
+ .MonitorInterval = std::chrono::seconds(ServerOptions.GcConfig.MonitorIntervalSeconds),
.Interval = std::chrono::seconds(ServerOptions.GcConfig.IntervalSeconds),
.MaxCacheDuration = std::chrono::seconds(ServerOptions.GcConfig.Cache.MaxDurationSeconds),
.CollectSmallObjects = ServerOptions.GcConfig.CollectSmallObjects,
@@ -754,7 +755,9 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
using namespace std::literals;
ZEN_INFO("instantiating structured cache service");
- m_CacheStore = std::make_unique<ZenCacheStore>(m_CasGc, m_DataRoot / "cache");
+ m_CacheStore = std::make_unique<ZenCacheStore>(
+ m_CasGc,
+ ZenCacheStore::Configuration{.BasePath = m_DataRoot / "cache", .AllowAutomaticCreationOfNamespaces = true});
const ZenUpstreamCacheConfig& UpstreamConfig = ServerOptions.UpstreamCacheConfig;
@@ -1161,7 +1164,7 @@ test_main(int argc, char** argv)
zen::MaximizeOpenFileCount();
- return ZEN_RUN_TESTS(argc, argv);
+ return ZEN_RUN_TESTS(argc, argv);
}
#endif