mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respecting filter in WLog_GetLogLevel

Browse Source
This commit is contained in:
Armin Novak 2016-03-02 14:11:15 +01:00
parent 857c37393b
commit 41fdac2667
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
winpr/libwinpr/utils/wlog/wlog.c
View File

@ -69,6 +69,7 @@ LPCSTR WLOG_LEVELS[7] =
static DWORD g_FilterCount = 0; static DWORD g_FilterCount = 0;
static wLogFilter* g_Filters = NULL; static wLogFilter* g_Filters = NULL;
static LONG WLog_GetFilterLogLevel(wLog* log);
static int WLog_ParseLogLevel(LPCSTR level); static int WLog_ParseLogLevel(LPCSTR level);
static BOOL WLog_ParseFilter(wLogFilter* filter, LPCSTR name); static BOOL WLog_ParseFilter(wLogFilter* filter, LPCSTR name);
@ -295,7 +296,11 @@ BOOL WLog_PrintMessage(wLog* log, wLogMessage* message, ...)
DWORD WLog_GetLogLevel(wLog* log) DWORD WLog_GetLogLevel(wLog* log)
{ {
if (log->Level == WLOG_LEVEL_INHERIT) LONG level = WLog_GetFilterLogLevel(log);
if (level >= 0)
return level;
else if (log->Level == WLOG_LEVEL_INHERIT)
{ {
return WLog_GetLogLevel(log->Parent); return WLog_GetLogLevel(log->Parent);
} }
@ -501,7 +506,7 @@ BOOL WLog_ParseFilter(wLogFilter* filter, LPCSTR name)
return TRUE; return TRUE;
} }
BOOL WLog_ParseFilters() BOOL WLog_ParseFilters(void)
{ {
BOOL res; BOOL res;
char* env; char* env;
@ -530,10 +535,10 @@ BOOL WLog_ParseFilters()
return res; return res;
} }
int WLog_GetFilterLogLevel(wLog* log) LONG WLog_GetFilterLogLevel(wLog* log)
{ {
DWORD i, j; DWORD i, j;
int iLevel = -1; LONG iLevel = -1;
BOOL match = FALSE; BOOL match = FALSE;
for (i = 0; i < g_FilterCount; i++) for (i = 0; i < g_FilterCount; i++)
@ -564,9 +569,7 @@ int WLog_GetFilterLogLevel(wLog* log)
} }
if (match) if (match)
{
iLevel = (int) g_Filters[i].Level; iLevel = (int) g_Filters[i].Level;
}
return iLevel; return iLevel;
} }
@ -622,35 +625,35 @@ wLog* WLog_New(LPCSTR name, wLog* rootLogger)
if (!log) if (!log)
return NULL; return NULL;
log->Name = _strdup(name); log->Name = _strdup(name);
if (!log->Name) if (!log->Name)
goto out_fail; goto out_fail;
if (!WLog_ParseName(log, name)) if (!WLog_ParseName(log, name))
goto out_fail; goto out_fail;
log->Parent = rootLogger; log->Parent = rootLogger;
log->ChildrenCount = 0; log->ChildrenCount = 0;
log->ChildrenSize = 16; log->ChildrenSize = 16;
if (!(log->Children = (wLog**) calloc(log->ChildrenSize, sizeof(wLog*)))) if (!(log->Children = (wLog**) calloc(log->ChildrenSize, sizeof(wLog*))))
goto out_fail; goto out_fail;
log->Appender = NULL; log->Appender = NULL;
if (rootLogger) if (rootLogger)
{ {
log->Level = WLOG_LEVEL_INHERIT; log->Level = WLOG_LEVEL_INHERIT;
} }
else else
{ {
log->Level = WLOG_INFO; log->Level = WLOG_INFO;
nSize = GetEnvironmentVariableA("WLOG_LEVEL", NULL, 0); nSize = GetEnvironmentVariableA("WLOG_LEVEL", NULL, 0);
if (nSize) if (nSize)
{ {
env = (LPSTR) malloc(nSize); env = (LPSTR) malloc(nSize);
if (!env) if (!env)
goto out_fail; goto out_fail;
@ -666,13 +669,13 @@ wLog* WLog_New(LPCSTR name, wLog* rootLogger)
if (iLevel >= 0) if (iLevel >= 0)
log->Level = (DWORD) iLevel; log->Level = (DWORD) iLevel;
} }
} }
iLevel = WLog_GetFilterLogLevel(log); iLevel = WLog_GetFilterLogLevel(log);
if (iLevel >= 0) if (iLevel >= 0)
log->Level = (DWORD) iLevel; log->Level = (DWORD) iLevel;
return log; return log;
@ -703,7 +706,7 @@ void WLog_Free(wLog* log)
static wLog* g_RootLog = NULL; static wLog* g_RootLog = NULL;
wLog* WLog_GetRoot() wLog* WLog_GetRoot(void)
{ {
char* env; char* env;
DWORD nSize; DWORD nSize;