Changeset 81038 in vbox

Timestamp:

Sep 27, 2019 7:42:28 AM (5 years ago)

Author:

vboxsync

Message:

Additions/VBoxClient: Moved modifying the release logger when running in non-daemonized mode into the generic initialization path of a service.

File:

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

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

@@ -250 +250 @@
         return RTMsgInitFailure(rc);
 
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExitFailure("VbglR3InitUser failed: %Rrc", rc);
-
     /* This should never be called twice in one process - in fact one Display
      * object should probably never be used from multiple threads anyway. */
@@ -275 +271 @@
             || !strcmp(argv[i], "--nodaemon"))
         {
-            /* If the user is running in "no daemon" mode anyway, send critical
-             * logging to stdout as well. */
-            PRTLOGGER pReleaseLog = RTLogRelGetDefaultInstance();
-            if (pReleaseLog)
-                rc = RTLogDestinations(pReleaseLog, "stdout");
-            if (pReleaseLog && RT_FAILURE(rc))
-                return RTMsgErrorExitFailure("failed to redivert error output, rc=%Rrc", rc);
-
             fDaemonise = false;
             if (   !strcmp(argv[i], "-f")
@@ -359 +347 @@
         RTMsgError("No service specified. Quitting because nothing to do!");
         return RTEXITCODE_SYNTAX;
+    }
+
+    /* Initialize VbglR3 before we do anything else with the logger. */
+    rc = VbglR3InitUser();
+    if (RT_FAILURE(rc))
+        VBClFatalError(("VbglR3InitUser failed: %Rrc", rc));
+
+    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);
+        }
     }