diff --git a/DnsServerCore/StatsManager.cs b/DnsServerCore/StatsManager.cs index 8c4d2c53..ea1fbc50 100644 --- a/DnsServerCore/StatsManager.cs +++ b/DnsServerCore/StatsManager.cs @@ -769,18 +769,15 @@ namespace DnsServerCore return data; } - public List> GetTopQueries(int minutes, int hitsPerMinute) + public List> GetLastHourEligibleQueries(int minimumHitsPerHour) { - if (minutes > 60) - throw new ArgumentOutOfRangeException("minutes"); - StatCounter totalStatCounter = new StatCounter(); totalStatCounter.Lock(); - DateTime lastHourDateTime = DateTime.UtcNow.AddMinutes(-minutes); + DateTime lastHourDateTime = DateTime.UtcNow.AddMinutes(-60); lastHourDateTime = new DateTime(lastHourDateTime.Year, lastHourDateTime.Month, lastHourDateTime.Day, lastHourDateTime.Hour, lastHourDateTime.Minute, 0, DateTimeKind.Utc); - for (int minute = 0; minute < minutes; minute++) + for (int minute = 0; minute < 60; minute++) { DateTime lastDateTime = lastHourDateTime.AddMinutes(minute); @@ -789,7 +786,7 @@ namespace DnsServerCore totalStatCounter.Merge(statCounter); } - return totalStatCounter.GetTopQueries(minutes * hitsPerMinute); + return totalStatCounter.GetEligibleQueries(minimumHitsPerHour); } #endregion @@ -1168,17 +1165,17 @@ namespace DnsServerCore return queryTypes; } - public List> GetTopQueries(int minimumHits) + public List> GetEligibleQueries(int minimumHits) { - List> topQueries = new List>(100); + List> eligibleQueries = new List>(100); foreach (KeyValuePair item in _queries) { if (item.Value.Count >= minimumHits) - topQueries.Add(new KeyValuePair(item.Key, item.Value.Count)); + eligibleQueries.Add(new KeyValuePair(item.Key, item.Value.Count)); } - return topQueries; + return eligibleQueries; } #endregion