Merge pull request #7259 from nextcloud/bugfix/fixLogIssues

Bugfix/fix log issues
nextcloud · Oct 4, 2024 · f65f7ea · f65f7ea
2 parents 94e8fb8 + 06f7cf4
commit f65f7ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -700,7 +700,7 @@ void Application::setupLogging()
         logger->setLogDir(_logDir.isEmpty() ? ConfigFile().logDir() : _logDir);
     }
     logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire());
-#if defined NEXTCLOUD_DEV
+#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV
     logger->setLogFlush(true);
     logger->setLogDebug(true);
 #else

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
@@ -120,27 +120,10 @@ void Logger::doLog(QtMsgType type, const QMessageLogContext &ctx, const QString
 {
     static long long int linesCounter = 0;
     const auto &msg = qFormatLogMessage(type, ctx, message);
-#if defined Q_OS_WIN && (defined NEXTCLOUD_DEV || defined QT_DEBUG)
+#if defined Q_OS_WIN && ((defined NEXTCLOUD_DEV && NEXTCLOUD_DEV) || defined QT_DEBUG)
     // write logs to Output window of Visual Studio
     {
-        QString prefix;
-        switch (type) {
-        case QtDebugMsg:
-            break;
-        case QtInfoMsg:
-            break;
-        case QtWarningMsg:
-            prefix = QStringLiteral("[WARNING] ");
-            break;
-        case QtCriticalMsg:
-            prefix = QStringLiteral("[CRITICAL ERROR] ");
-            break;
-        case QtFatalMsg:
-            prefix = QStringLiteral("[FATAL ERROR] ");
-            break;
-        }
-        auto msgW = QString(prefix + message).toStdWString();
-        msgW.append(L"\n");
+        const auto msgW = QStringLiteral("%1\n").arg(msg).toStdWString();
         OutputDebugString(msgW.c_str());
     }
 #endif