From 5d91331683463c910454ff78b8ec1f353655e1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 8 Jul 2015 14:48:19 +0200 Subject: [PATCH] add guhsettings for log path --- libguh/guhsettings.cpp | 4 ++-- server/logging/logengine.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp index ba2446d7..3065c8d8 100644 --- a/libguh/guhsettings.cpp +++ b/libguh/guhsettings.cpp @@ -121,11 +121,11 @@ QString GuhSettings::logPath() QString organisationName = QCoreApplication::instance()->organizationName(); if (organisationName == "guh-test") { - logPath = QDir::homePath() + ".config/" + organisationName + "/guhd-test.log"; + logPath = "/tmp/guhd-test.log"; } else if (GuhSettings::isRoot()) { logPath = "/var/log/guhd.log"; } else { - logPath = QDir::homePath() + ".config/" + organisationName + "/guhd.log"; + logPath = QDir::homePath() + "/.config/" + organisationName + "/guhd.log"; } return logPath; diff --git a/server/logging/logengine.cpp b/server/logging/logengine.cpp index 0b0a7e46..ad876258 100644 --- a/server/logging/logengine.cpp +++ b/server/logging/logengine.cpp @@ -19,6 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include "guhsettings.h" #include "logengine.h" #include "loggingcategories.h" #include "logging.h" @@ -41,7 +42,9 @@ LogEngine::LogEngine(QObject *parent): { m_db = QSqlDatabase::addDatabase("QSQLITE"); - m_db.setDatabaseName("/tmp/guhd.log"); + m_db.setDatabaseName(GuhSettings::logPath()); + + qCDebug(dcLogEngine) << "Opening logging database" << m_db.databaseName(); if (!m_db.isValid()) { qCWarning(dcLogEngine) << "Database not valid:" << m_db.lastError().driverText() << m_db.lastError().databaseText();