ShaYmez/HBmonitor
1
0
Fork 0
mirror of https://github.com/ShaYmez/HBmonitor.git synced 2025-10-31 12:50:20 -04:00
Code Issues Projects Releases Wiki Activity

Update name from "CLIENTS" to "PEERS"

Browse Source
This commit is contained in:
Cort Buffington 2018-10-29 08:18:44 -05:00
parent 165ffbcf26
commit dda32abe92
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
web_tables.py
View File

@ -67,7 +67,7 @@ OPCODE = {
# Global Variables: # Global Variables:
CONFIG = {} CONFIG = {}
CTABLE = {'MASTERS': {}, 'CLIENTS': {}} CTABLE = {'MASTERS': {}, 'PEERS': {}}
BRIDGES = {} BRIDGES = {}
BTABLE = {} BTABLE = {}
BTABLE['BRIDGES'] = {} BTABLE['BRIDGES'] = {}
@ -99,27 +99,27 @@ def alias_string(_id, _dict):
# Build the HBlink connections table # Build the HBlink connections table
def build_hblink_table(_config): def build_hblink_table(_config):
_stats_table = {'MASTERS': {}, 'CLIENTS': {}} _stats_table = {'MASTERS': {}, 'PEERS': {}}
for _hbp, _hbp_data in _config.iteritems(): for _hbp, _hbp_data in _config.iteritems():
if _hbp_data['ENABLED'] == True: if _hbp_data['ENABLED'] == True:
if _hbp_data['MODE'] == 'MASTER': if _hbp_data['MODE'] == 'MASTER':
_stats_table['MASTERS'][_hbp] = {} _stats_table['MASTERS'][_hbp] = {}
_stats_table['MASTERS'][_hbp]['REPEAT'] = _hbp_data['REPEAT'] _stats_table['MASTERS'][_hbp]['REPEAT'] = _hbp_data['REPEAT']
_stats_table['MASTERS'][_hbp]['CLIENTS'] = {} _stats_table['MASTERS'][_hbp]['PEERS'] = {}
for _client in _hbp_data['CLIENTS']: for _client in _hbp_data['PEERS']:
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)] = {} _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)] = {}
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['CALLSIGN'] = _hbp_data['CLIENTS'][_client]['CALLSIGN'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['CALLSIGN'] = _hbp_data['PEERS'][_client]['CALLSIGN']
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['CONNECTION'] = _hbp_data['CLIENTS'][_client]['CONNECTION'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['CONNECTION'] = _hbp_data['PEERS'][_client]['CONNECTION']
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['IP'] = _hbp_data['CLIENTS'][_client]['IP'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['IP'] = _hbp_data['PEERS'][_client]['IP']
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['PINGS_RECEIVED'] = _hbp_data['CLIENTS'][_client]['PINGS_RECEIVED'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PINGS_RECEIVED'] = _hbp_data['PEERS'][_client]['PINGS_RECEIVED']
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['LAST_PING'] = _hbp_data['CLIENTS'][_client]['LAST_PING'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['LAST_PING'] = _hbp_data['PEERS'][_client]['LAST_PING']
_stats_table['MASTERS'][_hbp]['CLIENTS'][int_id(_client)]['PORT'] = _hbp_data['CLIENTS'][_client]['PORT'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PORT'] = _hbp_data['PEERS'][_client]['PORT']
elif _hbp_data['MODE'] == 'CLIENT': elif _hbp_data['MODE'] == 'CLIENT':
_stats_table['CLIENTS'][_hbp] = {} _stats_table['PEERS'][_hbp] = {}
_stats_table['CLIENTS'][_hbp]['CALLSIGN'] = _hbp_data['CALLSIGN'] _stats_table['PEERS'][_hbp]['CALLSIGN'] = _hbp_data['CALLSIGN']
_stats_table['CLIENTS'][_hbp]['RADIO_ID'] = int_id(_hbp_data['RADIO_ID']) _stats_table['PEERS'][_hbp]['RADIO_ID'] = int_id(_hbp_data['RADIO_ID'])
_stats_table['CLIENTS'][_hbp]['MASTER_IP'] = _hbp_data['MASTER_IP'] _stats_table['PEERS'][_hbp]['MASTER_IP'] = _hbp_data['MASTER_IP']
_stats_table['CLIENTS'][_hbp]['STATS'] = _hbp_data['STATS'] _stats_table['PEERS'][_hbp]['STATS'] = _hbp_data['STATS']
return(_stats_table) return(_stats_table)