From 6aa8d3e5b6573310ca09738a947b86f740e0abf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Mon, 11 Apr 2016 11:00:14 +0200
Subject: [PATCH] logentries based on timemanager datetime

---
 server/guhcore.cpp           | 4 ++--
 server/logging/logengine.cpp | 6 +++---
 server/logging/logengine.h   | 2 +-
 server/logging/logentry.cpp  | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/guhcore.cpp b/server/guhcore.cpp
index 445e0931..02197336 100644
--- a/server/guhcore.cpp
+++ b/server/guhcore.cpp
@@ -121,7 +121,7 @@ GuhCore *GuhCore::instance()
 /*! Destructor of the \l{GuhCore}. */
 GuhCore::~GuhCore()
 {
-    m_logger->logSystemEvent(false);
+    m_logger->logSystemEvent(m_timeManager->currentDateTime(), false);
 }
 
 /*! Destroyes the \l{GuhCore} instance. */
@@ -400,7 +400,7 @@ GuhCore::GuhCore(QObject *parent) :
     connect(m_timeManager, &TimeManager::dateTimeChanged, this, &GuhCore::onDateTimeChanged);
     connect(m_timeManager, &TimeManager::tick, m_deviceManager, &DeviceManager::timeTick);
 
-    m_logger->logSystemEvent(true);
+    m_logger->logSystemEvent(m_timeManager->currentDateTime(), true);
 }
 
 /*! Connected to the DeviceManager's emitEvent signal. Events received in
diff --git a/server/logging/logengine.cpp b/server/logging/logengine.cpp
index c8fc31e1..1f29fe63 100644
--- a/server/logging/logengine.cpp
+++ b/server/logging/logengine.cpp
@@ -133,7 +133,7 @@ LogEngine::LogEngine(QObject *parent):
 {
     m_db = QSqlDatabase::addDatabase("QSQLITE");
     m_db.setDatabaseName(GuhSettings::logPath());
-    m_dbMaxSize = 8000;
+    m_dbMaxSize = 20000;
 
     if (QCoreApplication::instance()->organizationName() == "guh-test") {
         m_dbMaxSize = 20;
@@ -219,9 +219,9 @@ void LogEngine::clearDatabase()
     emit logDatabaseUpdated();
 }
 
-void LogEngine::logSystemEvent(bool active, Logging::LoggingLevel level)
+void LogEngine::logSystemEvent(const QDateTime &dateTime, bool active, Logging::LoggingLevel level)
 {
-    LogEntry entry(level, Logging::LoggingSourceSystem);
+    LogEntry entry(dateTime, level, Logging::LoggingSourceSystem);
     entry.setActive(active);
     appendLogEntry(entry);
 }
diff --git a/server/logging/logengine.h b/server/logging/logengine.h
index d06c9ba3..1cde1980 100644
--- a/server/logging/logengine.h
+++ b/server/logging/logengine.h
@@ -59,7 +59,7 @@ private:
 private:
     // Only GuhCore is allowed to log events.
     friend class GuhCore;
-    void logSystemEvent(bool active, Logging::LoggingLevel level = Logging::LoggingLevelInfo);
+    void logSystemEvent(const QDateTime &dateTime, bool active, Logging::LoggingLevel level = Logging::LoggingLevelInfo);
     void logEvent(const Event &event);
     void logAction(const Action &action, Logging::LoggingLevel level = Logging::LoggingLevelInfo, int errorCode = 0);
     void logRuleTriggered(const Rule &rule);
diff --git a/server/logging/logentry.cpp b/server/logging/logentry.cpp
index 6e88239c..7de1c1e0 100644
--- a/server/logging/logentry.cpp
+++ b/server/logging/logentry.cpp
@@ -37,6 +37,7 @@
 */
 
 #include "logentry.h"
+#include "guhcore.h"
 #include "jsonrpc/jsontypes.h"
 
 #include <QDebug>
@@ -57,7 +58,7 @@ LogEntry::LogEntry(QDateTime timestamp, Logging::LoggingLevel level, Logging::Lo
 
 /*! Constructs a \l{LogEntry} with the given \a level, \a source and \a errorCode.*/
 LogEntry::LogEntry(Logging::LoggingLevel level, Logging::LoggingSource source, int errorCode):
-    LogEntry(QDateTime::currentDateTime(), level, source, errorCode)
+    LogEntry(GuhCore::instance()->timeManager()->currentDateTime(), level, source, errorCode)
 {
 
 }