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 0c6d5d01b0be33e555d6bdf13679434003df559f..914a65819e4a1871f7db64ab5b2a5f106ffdc1b9 100644 (file)
--- 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 31f7439d305b4fc866f200a11c4e39e01ab71b34..188670b4a77b4beb6c6434ed9108cbc137b5ce37 100644 (file)
--- 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 7922276f8eaf4732cb3990aaa31df31cc0fc67fe..ff9da2dc0ee198aa750b95769f7e7124a165b196 100644 (file)
--- 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 4bb51babd122048bea498964c3ea0fd7f3d869ce..c341d2c52dfe5442c9612d149b9275961b9093da 100644 (file)
--- 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"