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

fix logfile handling and --verbose option

Browse Source
This commit is contained in:
Michael Zanetti 2018-08-14 22:44:03 +02:00 committed by Simon Stürz
parent e36432f905
commit 98e4950095
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-remoteproxy/proxyconfiguration.cpp
View File

@ -27,12 +27,10 @@ bool ProxyConfiguration::loadConfiguration(const QString &fileName)
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
qCDebug(dcApplication()) << settings.childGroups(); qCDebug(dcApplication()) << settings.childGroups();
settings.beginGroup("General");
setWriteLogFile(settings.value("writeLogs", false).toBool()); setWriteLogFile(settings.value("writeLogs", false).toBool());
setLogFileName(settings.value("logFile", "/var/log/nymea-remoteproxy.log").toString()); setLogFileName(settings.value("logFile", "/var/log/nymea-remoteproxy.log").toString());
setSslCertificateFileName(settings.value("certificate", "/etc/ssl/certs/ssl-cert-snakeoil.pem").toString()); setSslCertificateFileName(settings.value("certificate", "/etc/ssl/certs/ssl-cert-snakeoil.pem").toString());
setSslCertificateKeyFileName(settings.value("certificateKey", "/etc/ssl/private/ssl-cert-snakeoil.key").toString()); setSslCertificateKeyFileName(settings.value("certificateKey", "/etc/ssl/private/ssl-cert-snakeoil.key").toString());
settings.endGroup();
settings.beginGroup("WebSocketServer"); settings.beginGroup("WebSocketServer");
setWebSocketServerHost(QHostAddress(settings.value("host", "127.0.0.1").toString())); setWebSocketServerHost(QHostAddress(settings.value("host", "127.0.0.1").toString()));
@ -74,7 +72,7 @@ QString ProxyConfiguration::sslCertificateFileName() const
void ProxyConfiguration::setSslCertificateFileName(const QString &fileName) void ProxyConfiguration::setSslCertificateFileName(const QString &fileName)
{ {
m_logFileName = fileName; m_sslCertificateFileName = fileName;
} }
QString ProxyConfiguration::sslCertificateKeyFileName() const QString ProxyConfiguration::sslCertificateKeyFileName() const

20
server/main.cpp
View File

@ -13,6 +13,7 @@
#include <QSslConfiguration> #include <QSslConfiguration>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCommandLineOption> #include <QCommandLineOption>
#include <QStandardPaths>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -100,6 +101,8 @@ int main(int argc, char *argv[])
s_loggingFilters.insert("Authentication", true); s_loggingFilters.insert("Authentication", true);
s_loggingFilters.insert("ProxyServer", true); s_loggingFilters.insert("ProxyServer", true);
QString configFile = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/nymea/nymea-remoteproxy.conf";
// command line parser // command line parser
QCommandLineParser parser; QCommandLineParser parser;
parser.addHelpOption(); parser.addHelpOption();
@ -124,11 +127,11 @@ int main(int argc, char *argv[])
QCommandLineOption mockAuthenticatorOption(QStringList() << "m" << "mock-authenticator", "Start the server using a mock authenticator which returns always true."); QCommandLineOption mockAuthenticatorOption(QStringList() << "m" << "mock-authenticator", "Start the server using a mock authenticator which returns always true.");
parser.addOption(mockAuthenticatorOption); parser.addOption(mockAuthenticatorOption);
QCommandLineOption configOption(QStringList() << "c" <<"configuration", "The path to the proxy server configuration file. The default is /etc/nymea-remoteproxy/nymea-remoteproxy.conf", "configuration"); QCommandLineOption configOption(QStringList() << "c" <<"configuration", "The path to the proxy server configuration file. The default is " + configFile, "configuration");
configOption.setDefaultValue("/etc/nymea-remoteproxy/nymea-remoteproxy.conf"); configOption.setDefaultValue(configFile);
parser.addOption(configOption); parser.addOption(configOption);
QCommandLineOption verboseOption(QStringList() << "v" << "verbose", "Print more verbose."); QCommandLineOption verboseOption(QStringList() << "verbose", "Print more verbose.");
parser.addOption(verboseOption); parser.addOption(verboseOption);
parser.process(application); parser.process(application);
@ -136,11 +139,12 @@ int main(int argc, char *argv[])
// Create a default configuration // Create a default configuration
ProxyConfiguration *configuration = new ProxyConfiguration(nullptr); ProxyConfiguration *configuration = new ProxyConfiguration(nullptr);
if (parser.isSet(configOption)) { if (parser.isSet(configOption)) {
qCDebug(dcApplication()) << "Loading configuration file from" << parser.value(configOption); configFile = parser.value(configOption);
if (!configuration->loadConfiguration(parser.value(configOption))) { }
qCCritical(dcApplication()) << "Invalid configuration file passed" << parser.value(configOption); qCDebug(dcApplication()) << "Loading configuration file from" << configFile;
exit(-1); if (!configuration->loadConfiguration(parser.value(configOption))) {
} qCCritical(dcApplication()) << "Invalid configuration file passed" << parser.value(configOption);
exit(-1);
} }