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

enh: return value process

This commit is contained in:
kailixu 2024-09-25 14:18:47 +08:00
parent caa44873b8
commit 6e6df9fa08
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,9 @@ static OldFileKeeper *taosOpenNewFile() {
} }
TAOS_UNUSED(taosLockLogFile(pFile)); TAOS_UNUSED(taosLockLogFile(pFile));
TAOS_UNUSED(taosLSeekFile(pFile, 0, SEEK_SET)); if (taosLSeekFile(pFile, 0, SEEK_SET) < 0) {
uWarn("failed to seek file:%s, reason:%s", name, tstrerror(terrno));
}
TdFilePtr pOldFile = tsLogObj.logHandle->pFile; TdFilePtr pOldFile = tsLogObj.logHandle->pFile;
tsLogObj.logHandle->pFile = pFile; tsLogObj.logHandle->pFile = pFile;
@ -568,28 +570,33 @@ static int32_t taosInitNormalLog(const char *logName, int32_t maxFileNum) {
int64_t filesize = 0; int64_t filesize = 0;
if (taosFStatFile(tsLogObj.logHandle->pFile, &filesize, NULL) != 0) { if (taosFStatFile(tsLogObj.logHandle->pFile, &filesize, NULL) != 0) {
(void)printf("\nfailed to fstat log file:%s, reason:%s\n", name, strerror(errno)); (void)printf("\nfailed to fstat log file:%s, reason:%s\n", name, strerror(errno));
taosUnLockLogFile(tsLogObj.logHandle->pFile);
return terrno; return terrno;
} }
tsLogObj.lines = (int32_t)(filesize / 60); tsLogObj.lines = (int32_t)(filesize / 60);
if ((code = taosLSeekFile(tsLogObj.logHandle->pFile, 0, SEEK_END)) < 0) { if ((code = taosLSeekFile(tsLogObj.logHandle->pFile, 0, SEEK_END)) < 0) {
TAOS_UNUSED(printf("failed to seek to the end of log file:%s, reason:%s\n", name, tstrerror(code))); TAOS_UNUSED(printf("failed to seek to the end of log file:%s, reason:%s\n", name, tstrerror(code)));
taosUnLockLogFile(tsLogObj.logHandle->pFile);
return code; return code;
} }
(void)sprintf(name, "==================================================\n"); (void)sprintf(name, "==================================================\n");
if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) { if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) {
TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno))); TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno)));
taosUnLockLogFile(tsLogObj.logHandle->pFile);
return terrno; return terrno;
} }
(void)sprintf(name, " new log file \n"); (void)sprintf(name, " new log file \n");
if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) { if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) {
TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno))); TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno)));
taosUnLockLogFile(tsLogObj.logHandle->pFile);
return terrno; return terrno;
} }
(void)sprintf(name, "==================================================\n"); (void)sprintf(name, "==================================================\n");
if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) { if (taosWriteFile(tsLogObj.logHandle->pFile, name, (uint32_t)strlen(name)) <= 0) {
TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno))); TAOS_UNUSED(printf("failed to write to log file:%s, reason:%s\n", name, tstrerror(terrno)));
taosUnLockLogFile(tsLogObj.logHandle->pFile);
return terrno; return terrno;
} }
@ -635,9 +642,7 @@ static inline void taosPrintLogImp(ELogLevel level, int32_t dflag, const char *b
if (tsAsyncLog) { if (tsAsyncLog) {
TAOS_UNUSED(taosPushLogBuffer(tsLogObj.logHandle, buffer, len)); TAOS_UNUSED(taosPushLogBuffer(tsLogObj.logHandle, buffer, len));
} else { } else {
if (taosWriteFile(tsLogObj.logHandle->pFile, buffer, len) <= 0) { TAOS_UNUSED(taosWriteFile(tsLogObj.logHandle->pFile, buffer, len));
TAOS_UNUSED(printf("failed to write log to file, reason:%s\n", tstrerror(terrno)));
}
} }
if (tsNumOfLogLines > 0) { if (tsNumOfLogLines > 0) {
@ -732,9 +737,7 @@ void taosPrintSlowLog(const char *format, ...) {
if (tsAsyncLog) { if (tsAsyncLog) {
TAOS_UNUSED(taosPushLogBuffer(tsLogObj.slowHandle, buffer, len)); TAOS_UNUSED(taosPushLogBuffer(tsLogObj.slowHandle, buffer, len));
} else { } else {
if (taosWriteFile(tsLogObj.slowHandle->pFile, buffer, len) <= 0) { TAOS_UNUSED(taosWriteFile(tsLogObj.slowHandle->pFile, buffer, len));
TAOS_UNUSED(printf("failed to write slow log to file, reason:%s\n", tstrerror(terrno)));
}
} }
taosMemoryFree(buffer); taosMemoryFree(buffer);