tijmen/http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inject server configuration instead of using a singleton

Browse Source
This commit is contained in:
Tijmen van Nesselrooij
2019-06-16 11:49:04 +02:00
parent e9509fb117
commit d00fc33197
7 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/connectionoperator.cpp
View File

@@ -65,11 +65,11 @@ void ConnectionOperator::HandleNewConnection(ClientSocket const & newClient)
newClient.WriteBytes(bytesToSend);
}
ConnectionOperator::ConnectionOperator(Logger & _logger)
ConnectionOperator::ConnectionOperator(Logger & _logger, ServerConfiguration const & serverConfiguration)
: logger(_logger)
{
// Base static file server
auto const & staticFileRoot = ServerConfiguration::GetInstance().GetWwwRoot();
auto const & staticFileRoot = serverConfiguration.GetWwwRoot();
if (staticFileRoot.size() > 0)
{
middlewares.emplace_back(std::make_unique<Middleware::StaticContent>(_logger, staticFileRoot));