Log Qt debug messages

Author: tomas-soltys

src/cloud/doc/RELEASE_NOTES.txt

@@ -2,7 +2,9 @@
 Version 1.0.2
 
 - Improved HTTP server thread safety, timeout handling, and resource cleanup
+- Added certificate expiry validation to RHttpServer and RHttpClient
 - Added script to renew expired certificate for local accounts
+- Log Qt debug messages
 
 ------------------------------------------------------------------
 Version 1.0.1

src/cloud/scripts/cloud_start.sh

@@ -32,6 +32,8 @@ Usage: $myName.sh [OPTION]...
 
     --log-debug              Switch on debug log level
     --log-trace              Switch on trace log level
+    --log-ssl                Switch on ssl debug log level
+    --log-qt                 Switch on qt debug log level
 
     --help, -h, -?           Print this help and exit
 
@@ -44,7 +46,7 @@ do
         --interactive)
             runInteractive="true"
             ;;
-        --log-debug | --log-trace)
+        --log-debug | --log-trace | --log-ssl | --log-qt)
             additionalParameters+=" $1"
             ;;
         --help | -h | -?)

src/cloud/src/application.cpp

@@ -2,6 +2,7 @@
 #include <locale.h>
 
 #include <QDir>
+#include <QLoggingCategory>
 #include <QTimer>
 #include <QSettings>
 #include <QStandardPaths>
@@ -23,6 +24,8 @@ const QString Application::cloudDirectoryKey = "cloud-directory";
 const QString Application::rangeCaDirectoryKey = "range-ca-directory";
 const QString Application::logDebugKey = "log-debug";
 const QString Application::logTraceKey = "log-trace";
+const QString Application::logQtKey = "log-qt";
+const QString Application::logSslKey = "log-ssl";
 const QString Application::publicHttpPortKey = "public-http-port";
 const QString Application::privateHttpPortKey = "private-http-port";
 const QString Application::publicKeyKey = "public-key";
@@ -151,6 +154,8 @@ void Application::onStarted()
 
         validOptions.append(RArgumentOption(Application::logDebugKey,RArgumentOption::Switch,QVariant(),"Switch on debug log level",RArgumentOption::Logger,false));
         validOptions.append(RArgumentOption(Application::logTraceKey,RArgumentOption::Switch,QVariant(),"Switch on trace log level",RArgumentOption::Logger,false));
+        validOptions.append(RArgumentOption(Application::logQtKey,RArgumentOption::Switch,QVariant(),"Route Qt debug messages through RLogger",RArgumentOption::Logger,false));
+        validOptions.append(RArgumentOption(Application::logSslKey,RArgumentOption::Switch,QVariant(),"Enable Qt SSL debug logging",RArgumentOption::Logger,false));
 
         validOptions.append(RArgumentOption(Application::publicHttpPortKey,RArgumentOption::Integer,Configuration::getDefaultPublicHttpPort(),"Public HTTP Server port",RArgumentOption::Optional,false));
         validOptions.append(RArgumentOption(Application::privateHttpPortKey,RArgumentOption::Integer,Configuration::getDefaultPrivateHttpPort(),"Private HTTP Server port",RArgumentOption::Optional,false));
@@ -177,6 +182,30 @@ void Application::onStarted()
         {
             RLogger::getInstance().setLevel(R_LOG_LEVEL_TRACE);
         }
+        if (argumentsParser.isSet(Application::logQtKey) ||
+            argumentsParser.isSet(Application::logSslKey))
+        {
+            RLogger::installQtMessageHandler();
+            RLogger::debug("Qt message handler installed\n");
+
+            if (argumentsParser.isSet(Application::logQtKey))
+            {
+                QLoggingCategory::setFilterRules("qt.*=true");
+                RLogger::debug("All Qt logging enabled\n");
+            }
+            else if (argumentsParser.isSet(Application::logSslKey))
+            {
+                QLoggingCategory::setFilterRules(
+                    "qt.network.ssl.debug=true\n"
+                    "qt.network.ssl.info=true\n"
+                    "qt.network.ssl.warning=true\n"
+                    "qt.tlsbackend.ossl.debug=true\n"
+                    "qt.tlsbackend.ossl.info=true\n"
+                    "qt.tlsbackend.ossl.warning=true"
+                );
+                RLogger::debug("SSL logging enabled\n");
+            }
+        }
 
         if (argumentsParser.isSet("help"))
         {

src/cloud/src/application.h

@@ -24,6 +24,8 @@ class Application : public QCoreApplication
         static const QString rangeCaDirectoryKey;
         static const QString logDebugKey;
         static const QString logTraceKey;
+        static const QString logQtKey;
+        static const QString logSslKey;
         static const QString publicHttpPortKey;
         static const QString privateHttpPortKey;
         static const QString publicKeyKey;