crtxcr/qswiki
1
0
Fork 0
Code Issues 21 Pull Requests 1 Releases Activity

Begin removing several dependencies on Config object

Browse Source
This commit is contained in:
Albert S.
2019-09-29 17:12:36 +02:00
parent 327c0793d1
commit 364d82a99f
9 changed files with 127 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qswiki.cpp
View File

@@ -56,12 +56,12 @@ void setup_signal_handlers()
}
}
std::unique_ptr<ICache> createCache(const Config &config)
std::unique_ptr<ICache> createCache(const ConfigVariableResolver &resolver)
{
std::string path = config.getConfig("cache_fs_dir");
std::string path = resolver.getConfig("cache_fs_dir");
return std::make_unique<FsCache>(config.getConfig("cache_fs_dir"));
return std::make_unique<FsCache>(path);
}
int main(int argc, char **argv)
{
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
// TODO: config.connectiontring only works as long as we only support sqlite of course
if(!sandbox->enablePreWorker({
config.getConfig("cache_fs_dir"),
config.configVarResolver.getConfig("cache_fs_dir"),
config.templatepath,
std::filesystem::path(config.logfile).parent_path(),
std::filesystem::path(config.connectionstring).parent_path(),
@@ -130,10 +130,10 @@ int main(int argc, char **argv)
userdao->save(anon.value());
User::setAnon(anon.value());
Template siteTemplate{config};
UrlProvider urlprovider{config};
Template siteTemplate{config.templateprefix, config.templatepath, config.urls, config.configVarResolver};
UrlProvider urlprovider{config.urls};
auto cache = createCache(config);
auto cache = createCache(config.configVarResolver);
cache->clear();
RequestWorker requestWorker(*database, siteTemplate, urlprovider, *cache);