yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix when querying logs with invalid log level passed in as a string filter - now checks its valid/part of the enum

Browse Source
This commit is contained in:
Warren Buckley
2018-11-19 14:22:29 +00:00
parent f6b0b35ff7
commit 28fa60ea46
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs
View File

@@ -114,15 +114,29 @@ namespace Umbraco.Core.Logging.Viewer
var filteredLogs = GetLogs(startDate, endDate, expression, 0, int.MaxValue);
//This is user used the checkbox UI to toggle which log levels they wish to see
//If an empty array - its implied all levels to be viewed
if (logLevels.Length > 0)
//If an empty array or null - its implied all levels to be viewed
if (logLevels?.Length > 0)
{
var logsAfterLevelFilters = new List<LogEvent>();
bool validLogType = true;
foreach (var level in logLevels)
{
logsAfterLevelFilters.AddRange(filteredLogs.Where(x => x.Level.ToString() == level));
//Check if level string is part of the LogEventLevel enum
if(Enum.IsDefined(typeof(LogEventLevel), level))
{
validLogType = true;
logsAfterLevelFilters.AddRange(filteredLogs.Where(x => x.Level.ToString().ToLowerInvariant() == level.ToLowerInvariant()));
}
else
{
validLogType = false;
}
}
if (validLogType)
{
filteredLogs = logsAfterLevelFilters;
}
filteredLogs = logsAfterLevelFilters;
}
long totalRecords = filteredLogs.Count();