fix log function

This commit is contained in:
Andrei Yankovich 2022-01-08 12:23:46 +03:00
parent 2dca907f8b
commit 8a93dd9062
2 changed files with 16 additions and 7 deletions

View File

@ -37,19 +37,28 @@ void Params::log(const QString &log, VerboseLvl vLvl) {
writeLoginFile(log, vLvl); writeLoginFile(log, vLvl);
auto lvl = getVerboseLvl(); auto lvl = getVerboseLvl();
if (vLvl <= lvl) { if (vLvl <= lvl) {
switch (vLvl) { switch (vLvl) {
case VerboseLvl::Error: case VerboseLvl::Error:
qCritical() << lvlToString(vLvl) + ": " + log;
case VerboseLvl::Warning: { case VerboseLvl::Warning: {
std::cerr << lvlToString(vLvl) + ": " + log.toStdString() << std::endl; qWarning() << lvlToString(vLvl) + ": " + log;
break;
}
case VerboseLvl::Debug: {
qDebug() << lvlToString(vLvl) + ": " + log;
break;
}
case VerboseLvl::Info: {
qInfo() << lvlToString(vLvl) + ": " + log;
break; break;
} }
default: { default: {
std::cout << lvlToString(vLvl) + ": " + log.toStdString() << std::endl; qInfo() << lvlToString(vLvl) + ": " + log;
break; break;
} }
} }
@ -149,7 +158,7 @@ QString Params::timeString() {
return QDateTime::currentDateTime().toString(); return QDateTime::currentDateTime().toString();
} }
std::string Params::lvlToString(VerboseLvl vLvl) { QString Params::lvlToString(VerboseLvl vLvl) {
switch (vLvl) { switch (vLvl) {
case VerboseLvl::Error: { case VerboseLvl::Error: {
@ -188,9 +197,9 @@ bool Params::writeLoginFile(const QString &log, VerboseLvl vLvl) {
QTextStream stream(&logFile); QTextStream stream(&logFile);
#if QT_VERSION > QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION > QT_VERSION_CHECK(5, 14, 0)
stream << timeString() <<"| " << QString::fromStdString(lvlToString(vLvl)) + ": " + log << Qt::endl; stream << timeString() <<"| " << lvlToString(vLvl) + ": " + log << Qt::endl;
#else #else
stream << timeString() <<"| " << QString::fromStdString(lvlToString(vLvl)) + ": " + log << endl; stream << timeString() <<"| " << lvlToString(vLvl) + ": " + log << endl;
#endif #endif
logFile.close(); logFile.close();
} else { } else {

View File

@ -215,7 +215,7 @@ public:
private: private:
static QString timeString(); static QString timeString();
static std::string lvlToString(VerboseLvl vLvl); static QString lvlToString(VerboseLvl vLvl);
static bool writeLoginFile(const QString& log, VerboseLvl vLvl = VerboseLvl::Debug); static bool writeLoginFile(const QString& log, VerboseLvl vLvl = VerboseLvl::Debug);
/** /**