From b28e6353689ef35820cab6c4e16146cfb6d92a0b Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 6 Jun 2023 14:44:17 +0200 Subject: [PATCH 1/3] by default disable debug log level Signed-off-by: Matthieu Gallien --- src/gui/application.h | 2 +- src/libsync/configfile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/application.h b/src/gui/application.h index 664dae6a1b..bb9f97bef0 100644 --- a/src/gui/application.h +++ b/src/gui/application.h @@ -140,7 +140,7 @@ private: QString _logDir; int _logExpire = 0; bool _logFlush = false; - bool _logDebug = true; + bool _logDebug = false; bool _userTriggeredConnect = false; bool _debugMode = false; bool _backgroundMode = false; diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 8f03fad456..c6447ffe52 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -1048,7 +1048,7 @@ void ConfigFile::setLogDir(const QString &dir) bool ConfigFile::logDebug() const { QSettings settings(configFile(), QSettings::IniFormat); - return settings.value(QLatin1String(logDebugC), true).toBool(); + return settings.value(QLatin1String(logDebugC), false).toBool(); } void ConfigFile::setLogDebug(bool enabled) From a34bac35b73aa21448fe545cc0670147433d7dd7 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 6 Jun 2023 14:45:02 +0200 Subject: [PATCH 2/3] rotate log files every 3 MBs Signed-off-by: Matthieu Gallien --- src/libsync/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp index 2bed41214c..4de392bd33 100644 --- a/src/libsync/logger.cpp +++ b/src/libsync/logger.cpp @@ -36,7 +36,7 @@ namespace { constexpr int CrashLogSize = 20; -constexpr int MaxLogSizeBytes = 1024 * 512; +constexpr int MaxLogSizeBytes = 1024 * 1024 * 3; static bool compressLog(const QString &originalName, const QString &targetName) { From 5a86446f9142159d27ce6135a061a5273e1f3276 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 6 Jun 2023 14:45:18 +0200 Subject: [PATCH 3/3] do not log twice in debug mode Signed-off-by: Matthieu Gallien --- src/libsync/logger.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp index 4de392bd33..657242a7c3 100644 --- a/src/libsync/logger.cpp +++ b/src/libsync/logger.cpp @@ -142,9 +142,6 @@ void Logger::doLog(QtMsgType type, const QMessageLogContext &ctx, const QString msgW.append(L"\n"); OutputDebugString(msgW.c_str()); } -#elif defined(QT_DEBUG) - QTextStream cout(stdout, QIODevice::WriteOnly); - cout << msg << endl; #endif { QMutexLocker lock(&_mutex);