Merge pull request #6718 from nextcloud/ci/improveDevModeOnWindows

improve logs when build with NEXTCLOUD_DEV enabled
nextcloud · May 2, 2024 · 73c2f17 · 73c2f17
2 parents 75d0e9a + d0b4af6
commit 73c2f17
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/config.h.in b/config.h.in
@@ -61,4 +61,6 @@
 
 #cmakedefine CFAPI_SHELL_EXTENSIONS_LIB_NAME "@CFAPI_SHELL_EXTENSIONS_LIB_NAME@"
 
+#cmakedefine01 NEXTCLOUD_DEV
+
 #endif
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -699,8 +699,13 @@ void Application::setupLogging()
         logger->setLogDir(_logDir.isEmpty() ? ConfigFile().logDir() : _logDir);
     }
     logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire());
+#if defined NEXTCLOUD_DEV
+    logger->setLogFlush(true);
+    logger->setLogDebug(true);
+#else
     logger->setLogFlush(_logFlush || ConfigFile().logFlush());
     logger->setLogDebug(_logDebug || ConfigFile().logDebug());
+#endif
     if (!logger->isLoggingToFile() && ConfigFile().automaticLogDir()) {
         logger->setupTemporaryFolderLogDir();
     }

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
@@ -118,7 +118,7 @@ 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(QT_DEBUG)
+#if defined Q_OS_WIN && (defined NEXTCLOUD_DEV || defined QT_DEBUG)
     // write logs to Output window of Visual Studio
     {
         QString prefix;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,4 +61,6 @@

		#cmakedefine CFAPI_SHELL_EXTENSIONS_LIB_NAME "@CFAPI_SHELL_EXTENSIONS_LIB_NAME@"

		#cmakedefine01 NEXTCLOUD_DEV

		#endif