From: Oliver Kurth <okurth@vmware.com>
Date: Thu, 19 Jan 2017 01:28:16 +0000 (-0800)
Subject: Add enhanced log messages and a few new log messages.
X-Git-Tag: stable-10.1.5~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62258f09dd8bcdb92238d9203ceb7d6b035b33de;p=thirdparty%2Fopen-vm-tools.git

Add enhanced log messages and a few new log messages.
---

diff --git a/open-vm-tools/lib/syncDriver/syncDriverLinux.c b/open-vm-tools/lib/syncDriver/syncDriverLinux.c
index 4cd8f20a2..f1fff29bc 100644
--- a/open-vm-tools/lib/syncDriver/syncDriverLinux.c
+++ b/open-vm-tools/lib/syncDriver/syncDriverLinux.c
@@ -73,7 +73,9 @@ LinuxFiThaw(const SyncDriverHandle handle)
     * Thaw in the reverse order of freeze
     */
    for (i = sync->fdCnt; i > 0; i--) {
+      Debug(LGPFX "Thawing fd=%d.\n", sync->fds[i-1]);
       if (ioctl(sync->fds[i-1], FITHAW) == -1) {
+         Debug(LGPFX "Thaw failed for fd=%d.\n", sync->fds[i-1]);
          err = SD_ERROR;
       }
    }
@@ -104,6 +106,7 @@ LinuxFiClose(SyncDriverHandle handle)
     * Close in the reverse order of open
     */
    for (i = sync->fdCnt; i > 0; i--) {
+      Debug(LGPFX "Closing fd=%d.\n", sync->fds[i-1]);
       close(sync->fds[i-1]);
    }
    free(sync->fds);
@@ -198,7 +201,7 @@ LinuxDriver_Freeze(const GSList *paths,
          }
       }
 
-      Debug(LGPFX "freezing path '%s'.\n", path);
+      Debug(LGPFX "freezing path '%s' (fd=%d).\n", path, fd);
       if (ioctl(fd, FIFREEZE) == -1) {
          int ioctlerr = errno;
          /*
@@ -221,7 +224,7 @@ LinuxDriver_Freeze(const GSList *paths,
             break;
          }
       } else {
-         Debug(LGPFX "successfully froze '%s'.\n", path);
+         Debug(LGPFX "successfully froze '%s' (fd=%d).\n", path, fd);
          if (!DynBuf_Append(&fds, &fd, sizeof fd)) {
             if (ioctl(fd, FITHAW) == -1) {
                Warning(LGPFX "failed to thaw '%s': %d (%s)\n",
diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
index 66c240c97..61079dbf2 100644
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
@@ -1256,9 +1256,11 @@ ToolsDaemonTcloReceiveVixCommand(RpcInData *data) // IN
     */
    additionalError = VixTools_GetAdditionalError(requestMsg->opCode, err);
    if (additionalError) {
-      g_message("%s: additionalError = %u\n", __FUNCTION__, additionalError);
+      g_message("%s: command %u, additionalError = %u\n",
+                __FUNCTION__, requestMsg->opCode, additionalError);
    } else {
-      g_debug("%s: additionalError = %u\n", __FUNCTION__, additionalError);
+      g_debug("%s: command %u, additionalError = %u\n",
+              __FUNCTION__, requestMsg->opCode, additionalError);
    }
 
 abort:
diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index c89d6ac02..2a7b16df7 100644
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -267,7 +267,8 @@ VmBackup_SendEvent(const char *event,
 #endif
 
    if (!success) {
-      g_warning("Failed to send vmbackup event: %s.\n", result);
+      g_warning("Failed to send vmbackup event: %s, result: %s.\n",
+                msg, result);
    }
    vm_free(result);
    g_free(msg);