xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-13756]<fix>: file close memory error.

This commit is contained in:
afwerar 2022-04-01 16:11:51 +08:00
parent 70170d95d4
commit 79ffb5e5af
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/util/src/tlog.c
View File

@ -103,7 +103,6 @@ static void *taosAsyncOutputLog(void *param);
static int32_t taosPushLogBuffer(SLogBuff *tLogBuff, const char *msg, int32_t msgLen); static int32_t taosPushLogBuffer(SLogBuff *tLogBuff, const char *msg, int32_t msgLen);
static SLogBuff *taosLogBuffNew(int32_t bufSize); static SLogBuff *taosLogBuffNew(int32_t bufSize);
static void taosCloseLogByFd(TdFilePtr pFile); static void taosCloseLogByFd(TdFilePtr pFile);
static void taosDestroyLog();
static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum); static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum);
static int32_t taosCompressFile(char *srcFileName, char *destFileName); static int32_t taosCompressFile(char *srcFileName, char *destFileName);
@ -127,7 +126,6 @@ int32_t taosInitLog(const char *logName, int32_t maxFiles) {
tsLogObj.logHandle = taosLogBuffNew(LOG_DEFAULT_BUF_SIZE); tsLogObj.logHandle = taosLogBuffNew(LOG_DEFAULT_BUF_SIZE);
if (tsLogObj.logHandle == NULL) return -1; if (tsLogObj.logHandle == NULL) return -1;
if (taosOpenLogFile(fullName, tsNumOfLogLines, maxFiles) < 0) return -1; if (taosOpenLogFile(fullName, tsNumOfLogLines, maxFiles) < 0) return -1;
// atexit(taosDestroyLog);
if (taosStartLog() < 0) return -1; if (taosStartLog() < 0) return -1;
return 0; return 0;
} }
@ -150,14 +148,6 @@ void taosCloseLog() {
// taosCloseLog(); // taosCloseLog();
} }
static void taosDestroyLog() {
if(tsLogObj.logHandle != NULL) {
taosCloseFile(&tsLogObj.logHandle->pFile);
taosMemoryFreeClear(LOG_BUF_BUFFER(tsLogObj.logHandle));
taosMemoryFreeClear(tsLogObj.logHandle);
}
}
static bool taosLockLogFile(TdFilePtr pFile) { static bool taosLockLogFile(TdFilePtr pFile) {
if (pFile == NULL) return false; if (pFile == NULL) return false;