Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: Remove unnecessary path cleaner in tox logger. #266

Merged
merged 1 commit into from
Dec 21, 2024
+4 −17
Merged

cleanup: Remove unnecessary path cleaner in tox logger. #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions src/core/toxlogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,10 @@

#include <QDebug>
#include <QLoggingCategory>
#include <QRegularExpression>
#include <QString>
#include <QStringBuilder>

namespace ToxLogger {
namespace {

QByteArray cleanPath(const char* file)
{
// for privacy, make the path relative to the c-toxcore source directory
const QRegularExpression pathCleaner(QLatin1String{"[\\s|\\S]*c-toxcore."});
QByteArray cleanedPath = QString::fromUtf8(file).remove(pathCleaner).toUtf8();
cleanedPath.append('\0');
return cleanedPath;
}

Q_LOGGING_CATEGORY(toxcore, "tox.core")

} // namespace
Expand All @@ -38,22 +26,21 @@ void onLogMessage(Tox* tox, Tox_Log_Level level, const char* file, uint32_t line
{
std::ignore = tox;
std::ignore = user_data;
const QByteArray cleanedPath = cleanPath(file);

switch (level) {
case TOX_LOG_LEVEL_TRACE:
return; // trace level generates too much noise to enable by default
case TOX_LOG_LEVEL_DEBUG:
QMessageLogger(cleanedPath.data(), line, func).debug(toxcore) << message;
QMessageLogger(file, line, func).debug(toxcore) << message;
break;
case TOX_LOG_LEVEL_INFO:
QMessageLogger(cleanedPath.data(), line, func).info(toxcore) << message;
QMessageLogger(file, line, func).info(toxcore) << message;
break;
case TOX_LOG_LEVEL_WARNING:
QMessageLogger(cleanedPath.data(), line, func).warning(toxcore) << message;
QMessageLogger(file, line, func).warning(toxcore) << message;
break;
case TOX_LOG_LEVEL_ERROR:
QMessageLogger(cleanedPath.data(), line, func).critical(toxcore) << message;
QMessageLogger(file, line, func).critical(toxcore) << message;
break;
}
}
Expand Down
Loading