diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 8f3079b8dd23cf70b7c8b3a9f6fe9bb798e683ad..b7cf014f638d9d97659277fde1a837017241dc03 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -10,6 +10,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-577 - Unittest Query randomly hung - MS-587 - Count get wrong result after adding vectors and index built immediately - MS-599 - search wrong result when table created with metric_type: IP +- MS-601 - Docker logs error caused by get CPUTemperature error ## Improvement - MS-552 - Add and change the easylogging library diff --git a/cpp/src/metrics/SystemInfo.cpp b/cpp/src/metrics/SystemInfo.cpp index 70e917ad04d73901d4103dd37231a95f44cfe781..a49c3070a66a330e3e96c9c08a03181e272d9289 100644 --- a/cpp/src/metrics/SystemInfo.cpp +++ b/cpp/src/metrics/SystemInfo.cpp @@ -16,6 +16,7 @@ // under the License. #include "metrics/SystemInfo.h" +#include "utils/Log.h" #include #include @@ -63,12 +64,12 @@ SystemInfo::Init() { nvmlReturn_t nvmlresult; nvmlresult = nvmlInit(); if (NVML_SUCCESS != nvmlresult) { - printf("System information initilization failed"); + SERVER_LOG_ERROR << "System information initilization failed"; return; } nvmlresult = nvmlDeviceGetCount(&num_device_); if (NVML_SUCCESS != nvmlresult) { - printf("Unable to get devidce number"); + SERVER_LOG_ERROR << "Unable to get devidce number"; return; } @@ -154,7 +155,7 @@ SystemInfo::getTotalCpuTime(std::vector& work_time_array) { std::vector total_time_array; FILE* file = fopen("/proc/stat", "r"); if (file == NULL) { - perror("Could not open stat file"); + SERVER_LOG_ERROR << "Could not open stat file"; return total_time_array; } @@ -165,7 +166,7 @@ SystemInfo::getTotalCpuTime(std::vector& work_time_array) { char buffer[1024]; char* ret = fgets(buffer, sizeof(buffer) - 1, file); if (ret == NULL) { - perror("Could not read stat file"); + SERVER_LOG_ERROR << "Could not read stat file"; fclose(file); return total_time_array; } @@ -245,7 +246,7 @@ SystemInfo::CPUTemperature() { DIR *dir = NULL; dir = opendir(path.c_str()); if (!dir) { - perror("opendir"); + SERVER_LOG_ERROR << "Could not open hwmon directory"; return result; } @@ -262,7 +263,7 @@ SystemInfo::CPUTemperature() { object += "/temp1_input"; FILE *file = fopen(object.c_str(), "r"); if (file == nullptr) { - perror("Could not open temperature file"); + SERVER_LOG_ERROR << "Could not open temperature file" exit(1); } float temp;