Changeset 99689 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

Timestamp:

May 9, 2023 8:28:38 AM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157237

Message:

Guest Additions/VBoxClient: Dropped the idea of having an own logging facility (VBGHLogXXX) for shared guest/host code again; the (release) logger is flexible enough for this. bugref:10427

File:

• trunk/src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -674 +674 @@
                 if (RT_SUCCESS(rc))
                 {
-                    VBGHLogVerbositySet(2);
-                    VBGHDISPLAYSERVERTYPE const enmType = VBGHDisplayServerTypeDetect();
-                    VBClLogInfo("Detected session: %s\n", VBGHDisplayServerTypeToStr(enmType));
-                    return enmType != VBGHDISPLAYSERVERTYPE_NONE ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+                    /* Make sure that we increase the verbosity (if needed), to gain some more insights
+                     * when detecting the display server. */
+                    rc = VBClLogModify("stdout", g_cVerbosity);
+                    if (RT_SUCCESS(rc))
+                    {
+                        VBGHDISPLAYSERVERTYPE const enmType = VBGHDisplayServerTypeDetect();
+                        VBClLogInfo("Detected session: %s\n", VBGHDisplayServerTypeToStr(enmType));
+                        return enmType != VBGHDISPLAYSERVERTYPE_NONE ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+                    }
                 }
 
@@ -740 +745 @@
         return RTEXITCODE_FAILURE; /* Error message already printed in VBClLogCreateEx(). */
 
-    if (!fDaemonise)
-    {
-        /* If the user is running in "no daemon" mode, send critical logging to stdout as well. */
-        PRTLOGGER pReleaseLog = RTLogRelGetDefaultInstance();
-        if (pReleaseLog)
-        {
-            rc = RTLogDestinations(pReleaseLog, "stdout");
-            if (RT_FAILURE(rc))
-                return RTMsgErrorExitFailure("Failed to redivert error output, rc=%Rrc", rc);
-        }
-    }
+    /* If the user is running in "no daemon" mode, send critical logging to stdout as well. */
+    rc = VBClLogModify(fDaemonise ? "" : "stdout", g_cVerbosity);
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_FAILURE; /* Error message already printed in VBClLogModify(). */
 
     VBClLogInfo("VBoxClient %s r%s started. Verbose level = %d\n",
                 RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity);
-
-    VBGHLogVerbositySet(g_cVerbosity);
 
     /* Try to detect the current session type early on, if needed. */