ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix config initialisation when there's an old config around

Browse Source
This commit is contained in:
Michael Zanetti 2017-09-07 12:10:44 +02:00
parent f43afd7692
commit 759942b037
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
server/guhconfiguration.cpp
View File

@ -45,14 +45,22 @@ GuhConfiguration::GuhConfiguration(QObject *parent) :
#ifndef TESTING_ENABLED #ifndef TESTING_ENABLED
// TcpServer // TcpServer
bool createDefaults = !settings.childGroups().contains("TcpServer");
if (settings.childGroups().contains("TcpServer")) { if (settings.childGroups().contains("TcpServer")) {
settings.beginGroup("TcpServer"); settings.beginGroup("TcpServer");
foreach (const QString &key, settings.childGroups()) { if (settings.value("disabled").toBool()) {
ServerConfiguration config = readServerConfig("TcpServer", key); qCDebug(dcApplication) << "TCP Server disabled by configuration";
m_tcpServerConfigs[config.id] = config; } else if (!settings.childGroups().isEmpty()) {
foreach (const QString &key, settings.childGroups()) {
ServerConfiguration config = readServerConfig("TcpServer", key);
m_tcpServerConfigs[config.id] = config;
}
} else {
createDefaults = true;
} }
settings.endGroup(); settings.endGroup();
} else { }
if (createDefaults) {
qCWarning(dcApplication) << "No TCP Server configuration found. Generating default of 0.0.0.0:2222"; qCWarning(dcApplication) << "No TCP Server configuration found. Generating default of 0.0.0.0:2222";
ServerConfiguration config; ServerConfiguration config;
config.id = "default"; config.id = "default";
@ -66,14 +74,22 @@ GuhConfiguration::GuhConfiguration(QObject *parent) :
} }
// Webserver // Webserver
createDefaults = !settings.childGroups().contains("WebServer");
if (settings.childGroups().contains("WebServer")) { if (settings.childGroups().contains("WebServer")) {
settings.beginGroup("WebServer"); settings.beginGroup("WebServer");
foreach (const QString &key, settings.childGroups()) { if (settings.value("disabled").toBool()) {
WebServerConfiguration config = readWebServerConfig(key); qCDebug(dcApplication) << "WebServer disabled by configuration";
m_webServerConfigs[config.id] = config; } else if (!settings.childGroups().isEmpty()) {
foreach (const QString &key, settings.childGroups()) {
WebServerConfiguration config = readWebServerConfig(key);
m_webServerConfigs[config.id] = config;
}
} else {
createDefaults = true;
} }
settings.endGroup(); settings.endGroup();
} else { }
if (createDefaults) {
qCWarning(dcApplication) << "No WebServer configuration found. Generating default of 0.0.0.0:3333"; qCWarning(dcApplication) << "No WebServer configuration found. Generating default of 0.0.0.0:3333";
WebServerConfiguration insecureConfig; WebServerConfiguration insecureConfig;
insecureConfig.id = "insecure"; insecureConfig.id = "insecure";
@ -97,14 +113,22 @@ GuhConfiguration::GuhConfiguration(QObject *parent) :
} }
// WebSocket Server // WebSocket Server
createDefaults = !settings.childGroups().contains("WebServer");
if (settings.childGroups().contains("WebSocketServer")) { if (settings.childGroups().contains("WebSocketServer")) {
settings.beginGroup("WebSocketServer"); settings.beginGroup("WebSocketServer");
foreach (const QString &key, settings.childGroups()) { if (settings.value("disabled").toBool()) {
ServerConfiguration config = readServerConfig("WebSocketServer", key); qCDebug(dcApplication) << "WebSocket Server disabled by configuration.";
m_webSocketServerConfigs[config.id] = config; } else if (!settings.childGroups().isEmpty()) {
foreach (const QString &key, settings.childGroups()) {
ServerConfiguration config = readServerConfig("WebSocketServer", key);
m_webSocketServerConfigs[config.id] = config;
}
} else {
createDefaults = true;
} }
settings.endGroup(); settings.endGroup();
} else { }
if (createDefaults) {
qCWarning(dcApplication) << "No WebSocketServer configuration found. Generating default of 0.0.0.0:4444"; qCWarning(dcApplication) << "No WebSocketServer configuration found. Generating default of 0.0.0.0:4444";
ServerConfiguration config; ServerConfiguration config;
config.id = "default"; config.id = "default";