From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Dec 2021 20:48:50 +0000 (-0800)
Subject: Changed the log domain of the containerInfo plugin to containerinfo.
X-Git-Tag: stable-12.0.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc72edfdd60497b86b8e7f20495c85ce414d6106;p=thirdparty%2Fopen-vm-tools.git

Changed the log domain of the containerInfo plugin to containerinfo.

This will make both 'config group name' and 'logging domain' name the same.
Did some code-reorg.
---

diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfo.c b/open-vm-tools/services/plugins/containerInfo/containerInfo.c
index 0c6d5d01b..914a65819 100644
--- a/open-vm-tools/services/plugins/containerInfo/containerInfo.c
+++ b/open-vm-tools/services/plugins/containerInfo/containerInfo.c
@@ -27,12 +27,11 @@
 #   error This file should not be compiled.
 #endif
 
-#define G_LOG_DOMAIN "containerInfo"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "containerInfoInt.h"
 #include "codeset.h"
 #include "procMgr.h"
 #include "str.h"
@@ -41,7 +40,6 @@
 #include "util.h"
 #include "vm_atomic.h"
 #include "vmware/guestrpc/containerInfo.h"
-#include "containerInfoInt.h"
 #include "vmware/guestrpc/tclodefs.h"
 #include "vmware/tools/log.h"
 #include "vmware/tools/threadPool.h"
diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfoInt.h b/open-vm-tools/services/plugins/containerInfo/containerInfoInt.h
index 31f7439d3..188670b4a 100644
--- a/open-vm-tools/services/plugins/containerInfo/containerInfoInt.h
+++ b/open-vm-tools/services/plugins/containerInfo/containerInfoInt.h
@@ -19,6 +19,10 @@
 #ifndef _CONTAINERINFOINT_H_
 #define _CONTAINERINFOINT_H_
 
+#include "conf.h"
+
+#define G_LOG_DOMAIN CONFGROUPNAME_CONTAINERINFO
+
 #include <glib.h>
 
 /**
diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfo_docker.c b/open-vm-tools/services/plugins/containerInfo/containerInfo_docker.c
index 7922276f8..ff9da2dc0 100644
--- a/open-vm-tools/services/plugins/containerInfo/containerInfo_docker.c
+++ b/open-vm-tools/services/plugins/containerInfo/containerInfo_docker.c
@@ -26,10 +26,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#define G_LOG_DOMAIN "containerInfo"
-#include "jsmn.h"
 #include "containerInfoInt.h"
-#include <curl/curl.h> 
+#include "jsmn.h"
+#include <curl/curl.h>
 #include "vm_assert.h"
 
 #define HTTP_HEADER "HTTP"
diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfo_grpc.cc b/open-vm-tools/services/plugins/containerInfo/containerInfo_grpc.cc
index 4bb51babd..c341d2c52 100644
--- a/open-vm-tools/services/plugins/containerInfo/containerInfo_grpc.cc
+++ b/open-vm-tools/services/plugins/containerInfo/containerInfo_grpc.cc
@@ -25,8 +25,6 @@
  *    socket and the specified namespace is queried for any running containers.
  */
 
-#define G_LOG_DOMAIN "containerInfo"
-
 #include "containerInfoInt.h"
 #include "containers.grpc.pb.h"
 #include "containers.pb.h"