UI: StatManager: Refactor createConnBlock().

This commit is contained in:
Nodir Temirkhodjaev 2021-03-18 17:17:35 +03:00
parent 618d9feba6
commit 3f6f4e4302
2 changed files with 31 additions and 17 deletions

View File

@ -339,18 +339,7 @@ bool StatManager::logBlockedIp(const LogEntryBlockedIp &entry, qint64 unixTime)
const qint64 appId = getOrCreateAppId(entry.path(), unixTime, true);
ok = (appId != INVALID_APP_ID);
if (ok) {
const qint64 connId = createConn(entry, unixTime, appId);
ok = (connId > 0);
if (ok) {
ok = createConnBlock(connId, entry.blockReason());
if (ok) {
if (m_connBlockIdMax > 0) {
m_connBlockIdMax++;
} else {
m_connBlockIdMin = m_connBlockIdMax = 1;
}
}
}
ok = createConnBlock(entry, unixTime, appId);
}
m_sqliteDb->endTransaction(ok);
@ -554,7 +543,7 @@ bool StatManager::updateTraffic(SqliteStmt *stmt, quint32 inBytes, quint32 outBy
return m_sqliteDb->done(stmt);
}
qint64 StatManager::createConn(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId)
qint64 StatManager::insertConn(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId)
{
SqliteStmt *stmt = getSqliteStmt(StatSql::sqlInsertConn);
@ -575,14 +564,37 @@ qint64 StatManager::createConn(const LogEntryBlockedIp &entry, qint64 unixTime,
return 0;
}
bool StatManager::createConnBlock(qint64 connId, quint8 blockReason)
qint64 StatManager::insertConnBlock(qint64 connId, quint8 blockReason)
{
SqliteStmt *stmt = getSqliteStmt(StatSql::sqlInsertConnBlock);
stmt->bindInt64(1, connId);
stmt->bindInt(2, blockReason);
return m_sqliteDb->done(stmt);
if (m_sqliteDb->done(stmt)) {
return m_sqliteDb->lastInsertRowid();
}
return 0;
}
bool StatManager::createConnBlock(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId)
{
const qint64 connId = insertConn(entry, unixTime, appId);
if (connId <= 0)
return false;
const qint64 connBlockId = insertConnBlock(connId, entry.blockReason());
if (connBlockId <= 0)
return false;
if (m_connBlockIdMax > 0) {
m_connBlockIdMax++;
} else {
m_connBlockIdMin = m_connBlockIdMax = 1;
}
return true;
}
void StatManager::deleteRangeConnBlock(qint64 rowIdFrom, qint64 rowIdTo)

View File

@ -94,8 +94,10 @@ private:
bool updateTraffic(SqliteStmt *stmt, quint32 inBytes, quint32 outBytes, qint64 appId = 0);
qint64 createConn(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId);
bool createConnBlock(qint64 connId, quint8 blockReason);
qint64 insertConn(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId);
qint64 insertConnBlock(qint64 connId, quint8 blockReason);
bool createConnBlock(const LogEntryBlockedIp &entry, qint64 unixTime, qint64 appId);
void deleteRangeConnBlock(qint64 rowIdFrom, qint64 rowIdTo);
void deleteAppStmtList(const QStmtList &stmtList, SqliteStmt *stmtAppList);