mirror of
https://github.com/Prowlarr/Prowlarr
synced 2025-12-15 21:14:32 +01:00
Fixed: Ignore auth events from queries and grab stats
This commit is contained in:
parent
d22bf93dfd
commit
8c3a192dd0
1 changed files with 14 additions and 16 deletions
|
|
@ -26,11 +26,15 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
{
|
||||
var history = _historyService.Between(start, end);
|
||||
|
||||
var filteredHistory = history.Where(h => indexerIds.Contains(h.IndexerId));
|
||||
var filteredHistory = history.Where(h => indexerIds.Contains(h.IndexerId)).ToArray();
|
||||
|
||||
var groupedByIndexer = filteredHistory.GroupBy(h => h.IndexerId);
|
||||
var groupedByUserAgent = filteredHistory.GroupBy(h => h.Data.GetValueOrDefault("source") ?? "");
|
||||
var groupedByHost = filteredHistory.GroupBy(h => h.Data.GetValueOrDefault("host") ?? "");
|
||||
var groupedByIndexer = filteredHistory.GroupBy(h => h.IndexerId).ToArray();
|
||||
var groupedByUserAgent = filteredHistory
|
||||
.Where(h => h.EventType != HistoryEventType.IndexerAuth)
|
||||
.GroupBy(h => h.Data.GetValueOrDefault("source") ?? "").ToArray();
|
||||
var groupedByHost = filteredHistory
|
||||
.Where(h => h.EventType != HistoryEventType.IndexerAuth)
|
||||
.GroupBy(h => h.Data.GetValueOrDefault("host") ?? "").ToArray();
|
||||
|
||||
var indexerStatsList = new List<IndexerStatistics>();
|
||||
var userAgentStatsList = new List<UserAgentStatistics>();
|
||||
|
|
@ -60,7 +64,7 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
var temp = 0;
|
||||
var elapsedTimeEvents = sortedEvents
|
||||
.Where(h => int.TryParse(h.Data.GetValueOrDefault("elapsedTime"), out temp) && h.Data.GetValueOrDefault("cached") != "1")
|
||||
.Select(h => temp)
|
||||
.Select(_ => temp)
|
||||
.ToArray();
|
||||
|
||||
indexerStats.AverageResponseTime = elapsedTimeEvents.Any() ? (int)elapsedTimeEvents.Average() : 0;
|
||||
|
|
@ -68,6 +72,7 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
var failed = !historyEvent.Successful;
|
||||
|
||||
switch (historyEvent.EventType)
|
||||
{
|
||||
case HistoryEventType.IndexerQuery:
|
||||
|
|
@ -101,8 +106,6 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
indexerStats.NumberOfFailedRssQueries++;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -118,8 +121,8 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
};
|
||||
|
||||
var sortedEvents = indexer.OrderBy(v => v.Date)
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
|
||||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
|
|
@ -128,13 +131,10 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
case HistoryEventType.IndexerRss:
|
||||
case HistoryEventType.IndexerQuery:
|
||||
indexerStats.NumberOfQueries++;
|
||||
|
||||
break;
|
||||
case HistoryEventType.ReleaseGrabbed:
|
||||
indexerStats.NumberOfGrabs++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -149,8 +149,8 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
};
|
||||
|
||||
var sortedEvents = indexer.OrderBy(v => v.Date)
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
|
||||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
|
|
@ -163,8 +163,6 @@ public CombinedStatistics IndexerStatistics(DateTime start, DateTime end, List<i
|
|||
case HistoryEventType.ReleaseGrabbed:
|
||||
indexerStats.NumberOfGrabs++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue