Changeset 43927 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 21, 2012 10:29:18 AM (12 years ago)

Author:

vboxsync

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

82241

Message:

Forward ported r81841 + r82127 (VBoxHeadless/VBoxService: Enhanced (release flow) logging for user disconnect handling, more flow logging).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -262 +262 @@
 
 #if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */
-/* 
+/*
  * Simple wrapper to work around compiler-specific va_list madness.
  */
@@ -388 +388 @@
                 char **ppszSessions; int cSessions;
                 if (   (dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL)
-                    && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY, 
-                                                         DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions, 
+                    && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY,
+                                                         DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions,
                                                          DBUS_TYPE_INVALID /* Termination */))
                 {
@@ -429 +429 @@
                                         && ppwEntry->pw_name)
                                     {
-                                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n", 
+                                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n",
                                                            *ppszCurSession, ppwEntry->pw_name, uid);
 
@@ -471 +471 @@
                 {
                     VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s",
-                                     dbus_message_get_type(pMsgSessions), 
+                                     dbus_message_get_type(pMsgSessions),
                                      dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available\n");
                 }
@@ -566 +566 @@
 
     if (pszUserList && cUsersInList > 0)
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", "%s", pszUserList);
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", "%s", pszUserList);
     else
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", NULL);
-    VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%u", cUsersInList);
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", NULL);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("VMInfo: Error writing logged on users list, rc=%Rrc\n", rc);
+        cUsersInList = 0; /* Reset user count on error. */
+    }
+
+    rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%u", cUsersInList);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("VMInfo: Error writing logged on users count, rc=%Rrc\n", rc);
+        cUsersInList = 0; /* Reset user count on error. */
+    }
+
     if (g_cVMInfoLoggedInUsers != cUsersInList)
     {
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers",
-                                   cUsersInList == 0 ? "true" : "false");
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers",
+                                        cUsersInList == 0 ? "true" : "false");
+        if (RT_FAILURE(rc))
+            VBoxServiceError("VMInfo: Error writing no logged in users beacon, rc=%Rrc\n", rc);
         g_cVMInfoLoggedInUsers = cUsersInList;
     }
-
-    if (RT_SUCCESS(rc) && pszUserList)
+    if (pszUserList)
         RTStrFree(pszUserList);
     return rc;