From bd0afbc0c87d300b50d8095936fefa5f33f1ec9c Mon Sep 17 00:00:00 2001 From: James Muscat Date: Mon, 13 Apr 2015 18:14:39 +0100 Subject: [PATCH] Actually count the right numbers, in the right order, and limit range properly. --- src/eddn/StatsCollector.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/eddn/StatsCollector.py b/src/eddn/StatsCollector.py index d0edede..f45ad69 100644 --- a/src/eddn/StatsCollector.py +++ b/src/eddn/StatsCollector.py @@ -28,8 +28,8 @@ class StatsCollector(Thread): while True: sleep(60) with self.lock: - self.inboundHistory.append(self.inboundMessages) - self.outboundHistory.append(self.outboundMessages) + self.inboundHistory.appendleft(self.inboundMessages) + self.outboundHistory.appendleft(self.outboundMessages) self.inboundMessages = 0 self.outboundMessages = 0 @@ -42,17 +42,17 @@ class StatsCollector(Thread): self.outboundMessages += 1 def getInboundCount(self, minutes): - return sum(islice(self.inboundHistory, 0, max(minutes, self.max_minutes))) + return sum(islice(self.inboundHistory, 0, min(minutes, self.max_minutes))) def getOutboundCount(self, minutes): - return sum(islice(self.outboundHistory, 0, max(minutes, self.max_minutes))) + return sum(islice(self.outboundHistory, 0, min(minutes, self.max_minutes))) def getSummary(self): return { "inbound": { "1min": self.getInboundCount(1), "5min": self.getInboundCount(5), - "60min": self.getInboundCount(60) + "60min": self.getInboundCount(60), }, "outbound": { "1min": self.getOutboundCount(1),