smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! Introduce a ServerConfiguration object. 

Move from `ServerConfiguration` to `Server::Configuration`.
This commit is contained in:
Matthieu Gautier 2022-10-12 15:48:56 +02:00
parent 85f58b8e01
commit 5896691b31
5 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/server.h
View File

@ -29,56 +29,59 @@ namespace kiwix
class NameMapper;
class InternalServer;
class ServerConfiguration {
class Server {
public:
ServerConfiguration(Library* library, NameMapper* nameMapper=nullptr)
class Configuration {
public:
explicit Configuration(Library* library, NameMapper* nameMapper=nullptr)
: mp_library(library),
mp_nameMapper(nameMapper)
{}
ServerConfiguration& setRoot(const std::string& root);
ServerConfiguration& setAddress(const std::string& addr) {
Configuration& setRoot(const std::string& root);
Configuration& setAddress(const std::string& addr) {
m_addr = addr;
return *this;
}
ServerConfiguration& setPort(int port) {
Configuration& setPort(int port) {
m_port = port;
return *this;
}
ServerConfiguration& setNbThreads(int threads) {
Configuration& setNbThreads(int threads) {
m_nbThreads = threads;
return *this;
}
ServerConfiguration& setMultiZimSearchLimit(unsigned int limit) {
Configuration& setMultiZimSearchLimit(unsigned int limit) {
m_multizimSearchLimit = limit;
return *this;
}
ServerConfiguration& setIpConnectionLimit(int limit) {
Configuration& setIpConnectionLimit(int limit) {
m_ipConnectionLimit = limit;
return *this;
}
ServerConfiguration& setVerbose(bool verbose) {
Configuration& setVerbose(bool verbose) {
m_verbose = verbose;
return *this;
}
ServerConfiguration& setIndexTemplateString(const std::string& indexTemplateString) {
Configuration& setIndexTemplateString(const std::string& indexTemplateString) {
m_indexTemplateString = indexTemplateString;
return *this;
}
ServerConfiguration& setTaskbar(bool withTaskbar, bool withLibraryButton) {
Configuration& setTaskbar(bool withTaskbar, bool withLibraryButton) {
m_withTaskbar = withTaskbar;
m_withLibraryButton = withLibraryButton;
return *this;
}
ServerConfiguration& setBlockExternalLinks(bool blockExternalLinks) {
Configuration& setBlockExternalLinks(bool blockExternalLinks) {
m_blockExternalLinks = blockExternalLinks;
return *this;
}
@ -98,16 +101,12 @@ namespace kiwix
int m_ipConnectionLimit = 0;
};
class Server {
public:
/**
* The default constructor.
*
* @param library The library to serve.
*/
Server(const ServerConfiguration& configuration);
explicit Server(const Configuration& configuration);
virtual ~Server();
@ -125,7 +124,7 @@ namespace kiwix
std::string getAddress();
protected:
ServerConfiguration m_configuration;
Configuration m_configuration;
std::unique_ptr<InternalServer> mp_server;
};
}

4
src/server.cpp
View File

@ -29,7 +29,7 @@
namespace kiwix {
Server::Server(const ServerConfiguration& configuration) :
Server::Server(const Server::Configuration& configuration) :
m_configuration(configuration),
mp_server(nullptr)
{
@ -49,7 +49,7 @@ void Server::stop() {
}
}
ServerConfiguration& ServerConfiguration::setRoot(const std::string& root)
Server::Configuration& Server::Configuration::setRoot(const std::string& root)
{
m_root = root;
if (m_root[0] != '/') {

2
src/server/internalServer.cpp
View File

@ -366,7 +366,7 @@ public:
};
InternalServer::InternalServer(const ServerConfiguration& configuration) :
InternalServer::InternalServer(const Server::Configuration& configuration) :
m_configuration(configuration),
m_root(normalizeRootUrl(configuration.m_root)),
m_indexTemplateString(configuration.m_indexTemplateString.empty() ? RESOURCE::templates::index_html : configuration.m_indexTemplateString),

4
src/server/internalServer.h
View File

@ -93,7 +93,7 @@ class OPDSDumper;
class InternalServer {
public:
InternalServer(const ServerConfiguration& configuration);
InternalServer(const Server::Configuration& configuration);
virtual ~InternalServer();
MHD_Result handlerCallback(struct MHD_Connection* connection,
@ -149,7 +149,7 @@ class InternalServer {
typedef ConcurrentCache<std::string, std::shared_ptr<LockableSuggestionSearcher>> SuggestionSearcherCache;
private: // data
ServerConfiguration m_configuration;
Server::Configuration m_configuration;
std::string m_addr;
std::string m_root;
std::string m_indexTemplateString;

2
test/server_testing_tools.h
View File

@ -130,7 +130,7 @@ void ZimFileServer::run(int serverPort, std::string indexTemplateString)
} else {
nameMapper.reset(new kiwix::HumanReadableNameMapper(library, false));
}
kiwix::ServerConfiguration configuration(&library, nameMapper.get());
kiwix::Server::Configuration configuration(&library, nameMapper.get());
configuration.setRoot("ROOT")
.setAddress(address)
.setPort(serverPort)