diff --git a/source/tools/monitor/mservice/master/modules/mod_cgroup.c b/source/tools/monitor/mservice/master/modules/mod_cgroup.c index 0f6057dffa1b2d963dbc89d118d7f1f9e27b79fa..1ad6c6e69620bba7f508adf5f597b7b8469575f6 100644 --- a/source/tools/monitor/mservice/master/modules/mod_cgroup.c +++ b/source/tools/monitor/mservice/master/modules/mod_cgroup.c @@ -210,6 +210,15 @@ static void init_cgroups(void) memset(cgroups, 0, sizeof(cgroups)); n_cgs = 0; + + /*check docker exit*/ + if (access("/bin/docker", F_OK) != F_OK && + access("/usr/bin/docker", F_OK) != F_OK && + access("/bin/docker", F_OK) != F_OK && + access("/usr/bin/docker", F_OK) != F_OK) { + return; + } + result = popen("docker ps -q", "r"); for (i = 0; i < MAX_CGROUPS && !feof(result); i++) { if (feof(result) || !fgets(buffer, sizeof(buffer), result)) diff --git a/source/tools/monitor/mservice/master/src/output_print.c b/source/tools/monitor/mservice/master/src/output_print.c index 08e38145d7143a674bceb8c0e5f1a3469b8c7270..262af1f333a14d8f35fcf4f72043b1b0aae5edaf 100644 --- a/source/tools/monitor/mservice/master/src/output_print.c +++ b/source/tools/monitor/mservice/master/src/output_print.c @@ -145,6 +145,8 @@ printf_result(double result) printf("%5.1f%s", result / 1024 / 1024 / 1024, "G"); } else if ((1000 - result / 1024 / 1024 / 1024 / 1024) > 0.1) { printf("%5.1f%s", result / 1024 / 1024 / 1024 / 1024, "T"); + } else { + printf("------"); } printf("%s", PRINT_DATA_SPLIT); }