|
|
|
@ -76,18 +76,18 @@ void LogController::mainAction()
@@ -76,18 +76,18 @@ void LogController::mainAction()
|
|
|
|
|
|
|
|
|
|
for (const Log::Msg &msg : asConst(logger->getMessages(lastKnownId))) |
|
|
|
|
{ |
|
|
|
|
if (!((msg.type == Log::NORMAL && isNormal) |
|
|
|
|
|| (msg.type == Log::INFO && isInfo) |
|
|
|
|
|| (msg.type == Log::WARNING && isWarning) |
|
|
|
|
|| (msg.type == Log::CRITICAL && isCritical))) |
|
|
|
|
if (!(((msg.type == Log::NORMAL) && isNormal) |
|
|
|
|
|| ((msg.type == Log::INFO) && isInfo) |
|
|
|
|
|| ((msg.type == Log::WARNING) && isWarning) |
|
|
|
|
|| ((msg.type == Log::CRITICAL) && isCritical))) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
msgList.append(QJsonObject |
|
|
|
|
{ |
|
|
|
|
{KEY_LOG_ID, msg.id}, |
|
|
|
|
{KEY_LOG_TIMESTAMP, msg.timestamp}, |
|
|
|
|
{KEY_LOG_MSG_TYPE, msg.type}, |
|
|
|
|
{KEY_LOG_MSG_MESSAGE, msg.message} |
|
|
|
|
{QLatin1String(KEY_LOG_ID), msg.id}, |
|
|
|
|
{QLatin1String(KEY_LOG_TIMESTAMP), msg.timestamp}, |
|
|
|
|
{QLatin1String(KEY_LOG_MSG_TYPE), msg.type}, |
|
|
|
|
{QLatin1String(KEY_LOG_MSG_MESSAGE), msg.message} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -106,10 +106,8 @@ void LogController::mainAction()
@@ -106,10 +106,8 @@ void LogController::mainAction()
|
|
|
|
|
// - last_known_id (int): exclude messages with id <= 'last_known_id' (default -1)
|
|
|
|
|
void LogController::peersAction() |
|
|
|
|
{ |
|
|
|
|
int lastKnownId; |
|
|
|
|
bool ok; |
|
|
|
|
|
|
|
|
|
lastKnownId = params()["last_known_id"].toInt(&ok); |
|
|
|
|
bool ok = false; |
|
|
|
|
int lastKnownId = params()["last_known_id"].toInt(&ok); |
|
|
|
|
if (!ok) |
|
|
|
|
lastKnownId = -1; |
|
|
|
|
|
|
|
|
@ -120,11 +118,11 @@ void LogController::peersAction()
@@ -120,11 +118,11 @@ void LogController::peersAction()
|
|
|
|
|
{ |
|
|
|
|
peerList.append(QJsonObject |
|
|
|
|
{ |
|
|
|
|
{KEY_LOG_ID, peer.id}, |
|
|
|
|
{KEY_LOG_TIMESTAMP, peer.timestamp}, |
|
|
|
|
{KEY_LOG_PEER_IP, peer.ip}, |
|
|
|
|
{KEY_LOG_PEER_BLOCKED, peer.blocked}, |
|
|
|
|
{KEY_LOG_PEER_REASON, peer.reason} |
|
|
|
|
{QLatin1String(KEY_LOG_ID), peer.id}, |
|
|
|
|
{QLatin1String(KEY_LOG_TIMESTAMP), peer.timestamp}, |
|
|
|
|
{QLatin1String(KEY_LOG_PEER_IP), peer.ip}, |
|
|
|
|
{QLatin1String(KEY_LOG_PEER_BLOCKED), peer.blocked}, |
|
|
|
|
{QLatin1String(KEY_LOG_PEER_REASON), peer.reason} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|