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

logentries based on timemanager datetime

Browse Source
This commit is contained in:
Simon Stürz 2016-04-11 11:00:14 +02:00 committed by Michael Zanetti
parent e7ee05f017
commit 6aa8d3e5b6
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/guhcore.cpp
View File

@ -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

6
server/logging/logengine.cpp
View File

@ -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);
}

2
server/logging/logengine.h
View File

@ -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);

3
server/logging/logentry.cpp
View File

@ -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)
{
}