ShaYmez/DMRlink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Master Support Useable!

Browse Source
This commit is contained in:
Cort Buffington 2014-05-16 09:02:45 -05:00
parent b5ce0edbae
commit e223b26a99
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dmrlink.py
View File

@ -784,14 +784,15 @@ class IPSC(DatagramProtocol):
logger.debug('(%s) MASTER Connection Maintenance Loop Started', self._network) logger.debug('(%s) MASTER Connection Maintenance Loop Started', self._network)
update_time = int(time.time()) update_time = int(time.time())
for peer in self._peers.keys(): for peer_id in self._peers.keys():
peer_id = self._peers[peer] peer = self._peers[peer_id]
keep_alive_delta = update_time - peer_id['STATUS']['KEEP_ALIVE_RX_TIME'] keep_alive_delta = update_time - peer['STATUS']['KEEP_ALIVE_RX_TIME']
logger.debug('(%s) Time Since Last KeepAlive Request from Peer s: %s seconds', self._network, keep_alive_delta) logger.debug('(%s) Time Since Last KeepAlive Request from Peer %s: %s seconds', self._network, h(peer_id), keep_alive_delta)
if update_time < (peer['STATUS']['KEEP_ALIVE_RX_TIME'] + 30): if keep_alive_delta > 120:
de_register_peer(self._network, peer_id) de_register_peer(self._network, peer_id)
logger.info('(%s) Timeout Exceeded for Peer (%s), De-registering', self._network, peer_id) logger.warning('(%s) Timeout Exceeded for Peer %s, De-registering', self._network, h(peer_id))
# Timed loop used for IPSC connection Maintenance when we are a PEER # Timed loop used for IPSC connection Maintenance when we are a PEER
# #
@ -1129,7 +1130,7 @@ class IPSC(DatagramProtocol):
'KEEP_ALIVES_MISSED': 0, 'KEEP_ALIVES_MISSED': 0,
'KEEP_ALIVES_OUTSTANDING': 0, 'KEEP_ALIVES_OUTSTANDING': 0,
'KEEP_ALIVES_RECEIVED': 0, 'KEEP_ALIVES_RECEIVED': 0,
'KEEP_ALIVE_RX_TIME': 0 'KEEP_ALIVE_RX_TIME': int(time.time())
} }
} }
self._local['NUM_PEERS'] = len(self._peers) self._local['NUM_PEERS'] = len(self._peers)