From: Kruti <kpendharkar@vmware.com>
Date: Fri, 3 May 2024 16:05:44 +0000 (-0700)
Subject: Stop the glib based logging to avoid nested logging from RpcChannel error.
X-Git-Tag: stable-12.5.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e9e31448b81ff4ba8f4ec29c893957aa9d07aa;p=thirdparty%2Fopen-vm-tools.git

Stop the glib based logging to avoid nested logging from RpcChannel error.
---

diff --git a/open-vm-tools/libvmtools/vmtoolsLog.c b/open-vm-tools/libvmtools/vmtoolsLog.c
index 3560080fc..d5f41b652 100644
--- a/open-vm-tools/libvmtools/vmtoolsLog.c
+++ b/open-vm-tools/libvmtools/vmtoolsLog.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 2008-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2008-2021,2024 Broadcom. All rights reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -2670,15 +2671,17 @@ VMTools_TeardownVmxGuestLog(void)
 
    /*
     * Acquire the same locks as VMTools_SetupVmxGuestLog.
+    * Stop the glib based logging to avoid nested logging
+    * from RpcChannel error.
     */
    VMTools_AcquireLogStateLock();
-
+   StopGlibLogging();
    g_rec_mutex_lock(&gVmxGuestLogMutex);
 
    DestroyRpcChannel();
 
    g_rec_mutex_unlock(&gVmxGuestLogMutex);
-
+   RestartGlibLogging();
    VMTools_ReleaseLogStateLock();
 }