ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests settings and log path

pull/135/head
Simon Stürz 2015-10-08 11:38:37 +02:00 committed by Michael Zanetti
parent 7d63a58a6c
commit 40e8aeed89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libguh/guhsettings.cpp
View File

@ -71,7 +71,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
case SettingsRoleDevices:
// check if we are running a test
if (settingsPrefix == "guh-test") {
settingsFile = settingsPrefix + "/test-devices";
settingsFile = "/tmp/" + settingsPrefix + "/test-devices.conf";
m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
qDebug() << "Created test-devices settings" << m_settings->fileName();
} else if (rootPrivilege) {
@ -87,7 +87,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
case SettingsRoleRules:
// check if we are running a test
if (settingsPrefix == "guh-test") {
settingsFile = settingsPrefix + "/test-rules";
settingsFile = "/tmp/" + settingsPrefix + "/test-rules.conf";
m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
qDebug() << "Created test-rules settings" << m_settings->fileName();
} else if (rootPrivilege) {
@ -103,7 +103,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
case SettingsRolePlugins:
// check if we are running a test
if (settingsPrefix == "guh-test") {
settingsFile = settingsPrefix + "/test-plugins";
settingsFile = "/tmp/" + settingsPrefix + "/test-plugins.conf";
m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
qDebug() << "Created test-plugins settings" << m_settings->fileName();
} else if (rootPrivilege) {
@ -159,7 +159,7 @@ QString GuhSettings::logPath()
QString organisationName = QCoreApplication::instance()->organizationName();
if (organisationName == "guh-test") {
logPath = "/tmp/guhd-test.log";
logPath = "/tmp/" + organisationName + "/guhd-test.logs";
} else if (GuhSettings::isRoot()) {
logPath = "/var/log/guhd.log";
} else {