1.修改log
This commit is contained in:
parent
a60cfa1acf
commit
33dec69bff
|
@ -41,7 +41,7 @@ extern "C" {
|
||||||
#define WARNING_FILE_PATH SF_SD_ROOT"warning.txt"
|
#define WARNING_FILE_PATH SF_SD_ROOT"warning.txt"
|
||||||
#define INFO_FILE_PATH SF_SD_ROOT"info.txt"
|
#define INFO_FILE_PATH SF_SD_ROOT"info.txt"
|
||||||
|
|
||||||
#define SF_LOG_VAR 1
|
#define SF_LOG_VAR 0
|
||||||
|
|
||||||
#define LOG_AT_FILE_TMP_PATH "/tmp/SF_GPS.TXT"
|
#define LOG_AT_FILE_TMP_PATH "/tmp/SF_GPS.TXT"
|
||||||
|
|
||||||
|
@ -102,6 +102,43 @@ typedef enum SF_LOG_TYPE_E
|
||||||
#define SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
#define SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
#define SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define SYS_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define AE_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define CAM_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define NET_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define WIFI_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define P2P_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define BLU_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define MLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
#define MLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
@ -114,6 +151,42 @@ typedef enum SF_LOG_TYPE_E
|
||||||
#define SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
#define SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_MAX, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define SYS_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_SYS, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_SYS, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_SYS, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define SYS_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_SYS, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define AE_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_AE, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_AE, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_AE, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_AE, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define AE_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_AE, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define CAM_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_CAM, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_CAM, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_CAM, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define CAM_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_CAM, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define NET_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_4G, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_4G, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_4G, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define NET_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_4G, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define WIFI_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_WIFI, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_WIFI, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_WIFI, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define WIFI_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_WIFI, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define P2P_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_P2P, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_P2P, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_P2P, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define P2P_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_P2P, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
#define BLU_SLOGE(fmt, args...) sf_log_file(SF_LOG_LEVEL_ERROR, SF_LOG_TYPE_BLU, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGW(fmt, args...) sf_log_file(SF_LOG_LEVEL_WARNING, SF_LOG_TYPE_BLU, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGI(fmt, args...) sf_log_file(SF_LOG_LEVEL_INFO, SF_LOG_TYPE_BLU, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
#define BLU_SLOGD(fmt, args...) sf_log_file(SF_LOG_LEVEL_DEBUG, SF_LOG_TYPE_BLU, __FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#define SLOG_DM(fmt, args...) sf_log_module(__FUNCTION__, __LINE__, fmt, ##args)
|
#define SLOG_DM(fmt, args...) sf_log_module(__FUNCTION__, __LINE__, fmt, ##args)
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ static int sf_is_sdc_mounted(void)
|
||||||
{
|
{
|
||||||
char line[256];
|
char line[256];
|
||||||
static int is_mounted = 0;
|
static int is_mounted = 0;
|
||||||
printf("%s:%d is_mounted:%d", __FUNCTION__, __LINE__,is_mounted);
|
|
||||||
if(is_mounted)
|
if(is_mounted)
|
||||||
{
|
{
|
||||||
return is_mounted;
|
return is_mounted;
|
||||||
|
@ -114,6 +113,7 @@ static int sf_is_sdc_mounted(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
printf("%s:%d is_mounted:%d", __FUNCTION__, __LINE__,is_mounted);
|
||||||
|
|
||||||
return is_mounted;
|
return is_mounted;
|
||||||
}
|
}
|
||||||
|
@ -302,11 +302,28 @@ void sf_log_file(SF_LOG_LEVEL_e enLevel, SF_LOG_TYPE_e enType,const char *pszFun
|
||||||
CHAR tmpBuf[2048] = { 0 };
|
CHAR tmpBuf[2048] = { 0 };
|
||||||
CHAR enCodeLog[2048] = { 0 };
|
CHAR enCodeLog[2048] = { 0 };
|
||||||
|
|
||||||
|
|
||||||
enDstLevel = sf_log_Level_get();
|
enDstLevel = sf_log_Level_get();
|
||||||
if(enLevel <= enDstLevel)
|
if(enLevel <= enDstLevel)
|
||||||
{
|
{
|
||||||
pszFmt = (NULL == pszFmt) ? "" : pszFmt;
|
pszFmt = (NULL == pszFmt) ? "" : pszFmt;
|
||||||
|
|
||||||
|
if(enLevel == SF_LOG_LEVEL_ERROR)
|
||||||
|
{
|
||||||
|
fprintf(stdout,LIGHT_RED "[LOGE][%s:%d]"NONE,pszFunc, u32Line);
|
||||||
|
}else if(enLevel == SF_LOG_LEVEL_WARNING)
|
||||||
|
{
|
||||||
|
fprintf(stdout,YELLOW "[LOGW][%s:%d]"NONE,pszFunc, u32Line);
|
||||||
|
}else if(enLevel == SF_LOG_LEVEL_INFO)
|
||||||
|
{
|
||||||
|
fprintf(stdout,LIGHT_GREEN "[LOGI][%s:%d]"NONE,pszFunc, u32Line);
|
||||||
|
}else if(enLevel == SF_LOG_LEVEL_DEBUG)
|
||||||
|
{
|
||||||
|
fprintf(stdout,LIGHT_PURPLE "[LOGD][%s:%d]"NONE,pszFunc, u32Line);
|
||||||
|
}
|
||||||
|
va_start(args, pszFmt);
|
||||||
|
vfprintf(stdout, pszFmt, args);
|
||||||
|
va_end(args);
|
||||||
if((enLevel == SF_LOG_LEVEL_ERROR) ||(1 == puiPara->DebugMode))
|
if((enLevel == SF_LOG_LEVEL_ERROR) ||(1 == puiPara->DebugMode))
|
||||||
{
|
{
|
||||||
if(sf_is_sdc_mounted())
|
if(sf_is_sdc_mounted())
|
||||||
|
@ -359,6 +376,10 @@ void sf_log_file(SF_LOG_LEVEL_e enLevel, SF_LOG_TYPE_e enType,const char *pszFun
|
||||||
p = gmtime(&timep);
|
p = gmtime(&timep);
|
||||||
if(flog != NULL)
|
if(flog != NULL)
|
||||||
{
|
{
|
||||||
|
if(p == NULL)
|
||||||
|
{
|
||||||
|
printf("%s:%d p NULL", __FUNCTION__, __LINE__);
|
||||||
|
}
|
||||||
fseek(flog, 0L, SEEK_END);
|
fseek(flog, 0L, SEEK_END);
|
||||||
if(SF_LOG_LEVEL_ERROR == enLevel)
|
if(SF_LOG_LEVEL_ERROR == enLevel)
|
||||||
{
|
{
|
||||||
|
@ -395,8 +416,9 @@ void sf_log_file(SF_LOG_LEVEL_e enLevel, SF_LOG_TYPE_e enType,const char *pszFun
|
||||||
|
|
||||||
if(SF_LOG_TYPE_SYS == enType)
|
if(SF_LOG_TYPE_SYS == enType)
|
||||||
{
|
{
|
||||||
sprintf((char*)tmpBuf,"[%04d/%02d/%02d %02d:%02d:%02d][LOG][SYS]",p->tm_year + 1900, p->tm_mon + 1, p->tm_mday,
|
snprintf((char *)tmpBuf, sizeof(tmpBuf), "[%04d/%02d/%02d %02d:%02d:%02d][LOG][SYS]",p->tm_year + 1900, p->tm_mon + 1, p->tm_mday,
|
||||||
p->tm_hour, p->tm_min, p->tm_sec);
|
p->tm_hour, p->tm_min, p->tm_sec);
|
||||||
|
|
||||||
}
|
}
|
||||||
else if(SF_LOG_TYPE_AE == enType)
|
else if(SF_LOG_TYPE_AE == enType)
|
||||||
{
|
{
|
||||||
|
@ -461,22 +483,7 @@ void sf_log_file(SF_LOG_LEVEL_e enLevel, SF_LOG_TYPE_e enType,const char *pszFun
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(enLevel == SF_LOG_LEVEL_ERROR)
|
|
||||||
{
|
|
||||||
fprintf(stdout,LIGHT_RED "[LOGE][%s:%d]"NONE,pszFunc, u32Line);
|
|
||||||
}else if(enLevel == SF_LOG_LEVEL_WARNING)
|
|
||||||
{
|
|
||||||
fprintf(stdout,YELLOW "[LOGW][%s:%d]"NONE,pszFunc, u32Line);
|
|
||||||
}else if(enLevel == SF_LOG_LEVEL_INFO)
|
|
||||||
{
|
|
||||||
fprintf(stdout,LIGHT_GREEN "[LOGI][%s:%d]"NONE,pszFunc, u32Line);
|
|
||||||
}else if(enLevel == SF_LOG_LEVEL_DEBUG)
|
|
||||||
{
|
|
||||||
fprintf(stdout,LIGHT_PURPLE "[LOGD][%s:%d]"NONE,pszFunc, u32Line);
|
|
||||||
}
|
|
||||||
va_start(args, pszFmt);
|
|
||||||
vfprintf(stdout, pszFmt, args);
|
|
||||||
va_end(args);
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user