elB4RTO/LogDoctor
elB4RTO
/
LogDoctor
2
2
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 8 Wiki Activity

FIxed redundant database connections

This commit is contained in:
Valentino Orlandi 2022-10-06 21:30:04 +02:00
parent 7d02d5abbd
commit 300cfeacac
Signed by: elB4RTO
GPG Key ID: 1719E976DB2D4E71
3 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
logdoctor/modules/craplog/modules/hash.cpp
View File

@ -29,7 +29,12 @@ bool HashOps::loadUsedHashesLists( const std::string& db_path )
bool successful = true;
const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) );
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( db_path ) );
if ( ! db.open() ) {
@ -174,7 +179,12 @@ bool HashOps::insertUsedHashes( const std::string& db_path, const std::vector<st
bool proceed = true;
const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) );
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( db_path ) );
if ( ! db.open() ) {

63
logdoctor/modules/crapview/modules/query.cpp
View File

@ -154,7 +154,12 @@ void DbQuery::refreshDates(std::tuple<bool, std::unordered_map<int, std::unorder
std::unordered_map<int, std::unordered_map<int, std::unordered_map<int, std::vector<int>>>> dates = {
{11, {}}, {12, {}}, {13, {}} };
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -294,7 +299,12 @@ void DbQuery::updateWarnings( const QString& web_server, const std::vector<std::
{
bool successful = true;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -343,7 +353,12 @@ void DbQuery::getWarnCounts( std::tuple<bool, std::vector<std::vector<std::vecto
bool successful = true;
std::vector<std::vector<std::vector<std::vector<QString>>>> items;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -482,7 +497,12 @@ void DbQuery::getSpeedData(std::tuple<bool, std::vector<std::tuple<long long, st
bool successful = true;
std::vector<std::tuple<long long, std::vector<QString>>> data;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -833,7 +853,12 @@ void DbQuery::getItemsCount( std::tuple<bool, std::vector<std::tuple<QString, in
QHash<QString, int> aux_items;
std::vector<std::tuple<QString, int>> items;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -942,7 +967,12 @@ void DbQuery::getDaytimeCounts( std::tuple<bool, std::unordered_map<int, std::un
{22, {{0,0},{10,0},{20,0},{30,0},{40,0},{50,0}}}, {23, {{0,0},{10,0},{20,0},{30,0},{40,0},{50,0}}},
};
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -1180,7 +1210,12 @@ void DbQuery::getRelationalCountsDay(std::tuple<bool, std::vector<std::tuple<lon
bool successful = true;
std::vector<std::tuple<long long, int>> data;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -1423,7 +1458,12 @@ void DbQuery::getRelationalCountsPeriod(std::tuple<bool, std::vector<std::tuple<
bool successful = true;
std::vector<std::tuple<long long, int>> data;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {
@ -1808,7 +1848,12 @@ const bool DbQuery::getGlobalCounts( const QString& web_server, const std::unord
{
bool successful = true;
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( this->db_path ));
if ( ! db.open() ) {

14
logdoctor/utilities/checks.cpp
View File

@ -138,7 +138,12 @@ bool CheckSec::checkStatsDatabase( const std::string& db_path )
const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) );
const std::vector<QString> ws_names = { "apache", "nginx", "iis" };
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( db_path ) );
// check the existence
@ -346,7 +351,12 @@ bool CheckSec::checkHashesDatabase( const std::string& db_path )
const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) );
const std::vector<QString> ws_names = { "apache", "nginx", "iis" };
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
QSqlDatabase db;
if ( QSqlDatabase::contains("qt_sql_default_connection") ) {
db = QSqlDatabase::database("qt_sql_default_connection");
} else {
db = QSqlDatabase::addDatabase("QSQLITE");
}
db.setDatabaseName( QString::fromStdString( db_path ) );
// check the existence