zishuo/ascend-docker-runtime
1
0
Fork 0
mirror of https://github.com/Ascend/ascend-docker-runtime.git synced 2025-10-22 03:59:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Match-id-c24337903796e249c5347895091c6ee05fceafd4

Browse Source
This commit is contained in:
BianTanggui
2021-07-13 16:31:56 +08:00
parent b4ad57b92d
commit f540349978
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cli/src/logger.c
View File

@@ -51,9 +51,9 @@ int CreateLog(const char* filename)
long GetLogSize(const char* filename)
{
int iret;
iret = CreateLog(filename);
if (iret < 0) {
int ret;
ret = CreateLog(filename);
if (ret < 0) {
return -1;
}
FILE *fp = NULL;
@@ -77,7 +77,7 @@ long GetLogSize(const char* filename)
int LogLoop(const char* filename)
{
int iret;
int ret;
char* loopPath = LOG_PATH_DIR"docker-runtime-log.log.1";
int exist;
exist = access(loopPath, 0);
@@ -85,11 +85,11 @@ int LogLoop(const char* filename)
unlink(loopPath);
}
rename(filename, loopPath);
iret = CreateLog(filename);
if (iret < 0) {
ret = CreateLog(filename);
if (ret < 0) {
return -1;
}
return iret;
return ret;
}
void WriteLogFile(char* filename, long maxSize, const char* buffer, unsigned bufferSize)
@@ -97,14 +97,14 @@ void WriteLogFile(char* filename, long maxSize, const char* buffer, unsigned buf
if (filename != NULL && buffer != NULL) {
char path[PATH_MAX + 1] = {0x00};
FILE *fp = NULL;
int iret;
int ret;
long length = GetLogSize(filename);
if (length < 0) {
return;
}
if (length > maxSize) {
iret = LogLoop(filename);
if (iret < 0) {
ret = LogLoop(filename);
if (ret < 0) {
return;
}
}
@@ -113,7 +113,6 @@ void WriteLogFile(char* filename, long maxSize, const char* buffer, unsigned buf
}
fp = fopen(path, "a+");
if (fp != NULL) {
int ret;
char now[TEMP_BUFFER] = {0};
ret = GetCurrentLocalTime(now, sizeof(now) / sizeof(char));
if (ret < 0) {
@@ -136,7 +135,7 @@ void Logger(const char *msg, int level, int screen)
if (screen == SCREEN_YES) {
LOG_ERROR(msg);
}
int iret;
int ret;
char *logPath = LOG_PATH_DIR"docker-runtime-log.log";
if (MakeDirWithParent(LOG_PATH_DIR, DEFAULT_LOGDIR_MODE) < 0) {
return;
@@ -151,18 +150,18 @@ void Logger(const char *msg, int level, int screen)
}
switch (level) {
case LEVEL_DEBUG:
iret = sprintf_s(buffer, destMax, "[Debug]%s\n", msg);
ret = sprintf_s(buffer, destMax, "[Debug]%s\n", msg);
break;
case LEVEL_ERROR:
iret = sprintf_s(buffer, destMax, "[Error]%s\n", msg);
ret = sprintf_s(buffer, destMax, "[Error]%s\n", msg);
break;
case LEVEL_WARN:
iret = sprintf_s(buffer, destMax, "[Warn]%s\n", msg);
ret = sprintf_s(buffer, destMax, "[Warn]%s\n", msg);
break;
default:
iret = sprintf_s(buffer, destMax, "[Info]%s\n", msg);
ret = sprintf_s(buffer, destMax, "[Info]%s\n", msg);
}
if (iret < 0) {
if (ret < 0) {
free(buffer);
return;
}