From 88421dfb93e5cd541e0c849a9a9807d80fb1ebfb Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 5 Jan 2022 17:59:33 +0000 Subject: [PATCH] Revert "Merge branch 'rate'" This reverts commit ead81e8140c9c10600926c6b2b61956d001d5e3a, reversing changes made to a70db646207ac6043d5b82f30c17edb83a7962d6. --- bridge_master.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 5cde617..6c47c57 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -1518,8 +1518,7 @@ class routerOBP(OPENBRIDGE): if 'LOOPLOG' not in self.STATUS[_stream_id] or not self.STATUS[_stream_id]['LOOPLOG']: call_duration = pkt_time - self.STATUS[_stream_id]['START'] packet_rate = 0 - if 'packets' in self.STATUS[_stream_id]: - packet_rate = self.STATUS[_stream_id]['packets'] / call_duration + packet_rate = self.STATUS[_stream_id]['packets'] / call_duration logger.warning("(%s) OBP UNIT *LoopControl* FIRST OBP %s, STREAM ID: %s, TG %s, IGNORE THIS SOURCE. PACKET RATE %0.2f/s",self._system, fi, int_id(_stream_id), int_id(_dst_id),packet_rate) self.STATUS[_stream_id]['LOOPLOG'] = True self.STATUS[_stream_id]['LAST'] = pkt_time @@ -1678,8 +1677,7 @@ class routerOBP(OPENBRIDGE): if 'LOOPLOG' not in self.STATUS[_stream_id] or not self.STATUS[_stream_id]['LOOPLOG']: call_duration = pkt_time - self.STATUS[_stream_id]['START'] packet_rate = 0 - if 'packets' in self.STATUS[_stream_id]: - packet_rate = self.STATUS[_stream_id]['packets'] / call_duration + packet_rate = self.STATUS[_stream_id]['packets'] / call_duration logger.warning("(%s) OBP *LoopControl* FIRST OBP %s, STREAM ID: %s, TG %s, IGNORE THIS SOURCE. PACKET RATE %0.2f/s",self._system, fi, int_id(_stream_id), int_id(_dst_id),call_duration) self.STATUS[_stream_id]['LOOPLOG'] = True self.STATUS[_stream_id]['LAST'] = pkt_time