ShaYmez/HBmonitor
1
0
Fork 0
mirror of https://github.com/ShaYmez/HBmonitor.git synced 2024-11-22 07:54:53 -05:00
Code Issues Projects Releases Wiki Activity

progress on realtime stats

Browse Source
This commit is contained in:
Cort Buffington 2018-11-30 20:22:16 -06:00
parent 670f2b57dd
commit 9a82e0d743
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web_tables.py
View File

@ -53,8 +53,6 @@ from dmr_utils.utils import int_id, get_alias, try_download, mk_full_id_dict
from config import * from config import *
#from ipsc_const import * #from ipsc_const import *
from pprint import pprint
# Opcodes for reporting protocol to HBlink # Opcodes for reporting protocol to HBlink
OPCODE = { OPCODE = {
'CONFIG_REQ': '\x00', 'CONFIG_REQ': '\x00',
@ -147,6 +145,18 @@ def build_hblink_table(_config):
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PINGS_RECEIVED'] = _hbp_data['PEERS'][_client]['PINGS_RECEIVED'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PINGS_RECEIVED'] = _hbp_data['PEERS'][_client]['PINGS_RECEIVED']
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['LAST_PING'] = _hbp_data['PEERS'][_client]['LAST_PING'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['LAST_PING'] = _hbp_data['PEERS'][_client]['LAST_PING']
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PORT'] = _hbp_data['PEERS'][_client]['PORT'] _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['PORT'] = _hbp_data['PEERS'][_client]['PORT']
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]= {}
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]['TS'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]['TYPE'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]['SUB'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]['SRC'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][1]['DEST'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2] = {}
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2]['TS'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2]['SUB'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2]['TYPE'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2]['SRC'] = ''
_stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)][2]['DEST'] = ''
elif _hbp_data['MODE'] == 'PEER': elif _hbp_data['MODE'] == 'PEER':
_stats_table['PEERS'][_hbp] = {} _stats_table['PEERS'][_hbp] = {}
_stats_table['PEERS'][_hbp]['CALLSIGN'] = _hbp_data['CALLSIGN'] _stats_table['PEERS'][_hbp]['CALLSIGN'] = _hbp_data['CALLSIGN']
@ -225,14 +235,28 @@ def build_stats():
build_time = now build_time = now
def table_update(p): def table_update(p):
action = p[1]
system = p[2] system = p[2]
timeSlot = p[6] timeSlot = p[6]
callType = p[0] callType = p[0]
sourceSub = p[5] sourceSub = p[5]
sourcePeer = p[4] sourcePeer = p[4]
destination = p[7] destination = p[7]
pprint(CTABLE)
if action == 'START':
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TS'] = True
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TYPE'] = callType
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SUB'] = sourceSub
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SRC'] = sourcePeer
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['DEST'] = destination
if action == 'END':
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TS'] = False
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TYPE'] = ''
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SUB'] = ''
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SRC'] = ''
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['DEST'] = ''
build_Stats()
# #
# PROCESS IN COMING MESSAGES AND TAKE THE CORRECT ACTION DEPENING ON THE OPCODE # PROCESS IN COMING MESSAGES AND TAKE THE CORRECT ACTION DEPENING ON THE OPCODE
# #