ShaYmez/HBmonitor
1
0
Fork 0
mirror of https://github.com/ShaYmez/HBmonitor.git synced 2024-11-25 01:08:43 -05:00
Code Issues Projects Releases Wiki Activity

updated TX listings

Browse Source
This commit is contained in:
Cort Buffington 2018-12-05 11:57:01 -06:00
parent c8126ced0d
commit e153abc3f2
2 changed files with 67 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/hblink_table.html
View File

@ -35,17 +35,17 @@
<td rowspan="2">{{ _cdata['RX_FREQ'] }}<br>{{ _cdata['TX_FREQ'] }}</td> <td rowspan="2">{{ _cdata['RX_FREQ'] }}<br>{{ _cdata['TX_FREQ'] }}</td>
<td rowspan="2">{{ _cdata['COLORCODE'] }}<br>{{ _cdata['SLOTS'] }}</td> <td rowspan="2">{{ _cdata['COLORCODE'] }}<br>{{ _cdata['SLOTS'] }}</td>
<td style="background-color:#{{ _cdata[1]['COLOR'] }}">TS1</td> <td style="background-color:#{{ _cdata[1]['COLOR'] }}; color:#{{ _cdata[1]['BGCOLOR'] }}">TS1</td>
<td style="background-color:#{{ _cdata[1]['COLOR'] }}">{{ _cdata[1]['TYPE'] }}</td> <td style="background-color:#{{ _cdata[1]['COLOR'] }}; color:#{{ _cdata[1]['BGCOLOR'] }}">{{ _cdata[1]['TYPE'] }}</td>
<td style="background-color:#{{ _cdata[1]['COLOR'] }}">{{ _cdata[1]['SUB'] }}</td> <td style="background-color:#{{ _cdata[1]['COLOR'] }}; color:#{{ _cdata[1]['BGCOLOR'] }}">{{ _cdata[1]['SUB'] }}</td>
<td style="background-color:#{{ _cdata[1]['COLOR'] }}">{{ 'SELF' if _cdata[1]['SRC'] == _client else _cdata[1]['SRC'] }}</td> <td style="background-color:#{{ _cdata[1]['COLOR'] }}; color:#{{ _cdata[1]['BGCOLOR'] }}">{{ _cdata[1]['SRC'] }}</td>
<td style="background-color:#{{ _cdata[1]['COLOR'] }}">{{ _cdata[1]['DEST'] }}</td> <td style="background-color:#{{ _cdata[1]['COLOR'] }}; color:#{{ _cdata[1]['BGCOLOR'] }}">{{ _cdata[1]['DEST'] }}</td>
<tr> <tr>
<td style="background-color:#{{ _cdata[2]['COLOR'] }}">TS2</td> <td style="background-color:#{{ _cdata[2]['COLOR'] }}; color:#{{ _cdata[2]['BGCOLOR'] }}">TS2</td>
<td style="background-color:#{{ _cdata[2]['COLOR'] }}">{{ _cdata[2]['TYPE'] }}</td> <td style="background-color:#{{ _cdata[2]['COLOR'] }}; color:#{{ _cdata[2]['BGCOLOR'] }}">{{ _cdata[2]['TYPE'] }}</td>
<td style="background-color:#{{ _cdata[2]['COLOR'] }}">{{ _cdata[2]['SUB'] }}</td> <td style="background-color:#{{ _cdata[2]['COLOR'] }}; color:#{{ _cdata[2]['BGCOLOR'] }}">{{ _cdata[2]['SUB'] }}</td>
<td style="background-color:#{{ _cdata[2]['COLOR'] }}">{{ _cdata[2]['SRC'] }}</td> <td style="background-color:#{{ _cdata[2]['COLOR'] }}; color:#{{ _cdata[2]['BGCOLOR'] }}">{{ _cdata[2]['SRC'] }}</td>
<td style="background-color:#{{ _cdata[2]['COLOR'] }}">{{ _cdata[2]['DEST'] }}</td> <td style="background-color:#{{ _cdata[2]['COLOR'] }}; color:#{{ _cdata[2]['BGCOLOR'] }}">{{ _cdata[2]['DEST'] }}</td>
</tr> </tr>
</tr> </tr>

89
web_tables.py
View File

@ -76,6 +76,7 @@ BRIDGES_RX = ''
CONFIG_RX = '' CONFIG_RX = ''
LOGBUF = deque(100*[''], 100) LOGBUF = deque(100*[''], 100)
RED = '#ff0000' RED = '#ff0000'
BLACK = '#000000'
GREEN = '#00ff00' GREEN = '#00ff00'
BLUE = '#0000ff' BLUE = '#0000ff'
ORANGE = '#ff8000' ORANGE = '#ff8000'
@ -172,6 +173,7 @@ def add_hb_peer(_peer_conf, _ctable_loc, _peer):
for ts in range(1,3): for ts in range(1,3):
_ctable_peer[ts]= {} _ctable_peer[ts]= {}
_ctable_peer[ts]['COLOR'] = '' _ctable_peer[ts]['COLOR'] = ''
_ctable_peer[ts]['BGCOLOR'] = ''
_ctable_peer[ts]['TS'] = '' _ctable_peer[ts]['TS'] = ''
_ctable_peer[ts]['TYPE'] = '' _ctable_peer[ts]['TYPE'] = ''
_ctable_peer[ts]['SUB'] = '' _ctable_peer[ts]['SUB'] = ''
@ -276,9 +278,11 @@ def build_bridge_table(_bridges):
if system['ACTIVE'] == True: if system['ACTIVE'] == True:
_stats_table[_bridge][system['SYSTEM']]['ACTIVE'] = 'Connected' _stats_table[_bridge][system['SYSTEM']]['ACTIVE'] = 'Connected'
_stats_table[_bridge][system['SYSTEM']]['COLOR'] = GREEN _stats_table[_bridge][system['SYSTEM']]['COLOR'] = GREEN
_stats_table[_bridge][system['SYSTEM']]['BGCOLOR'] = BLACK
elif system['ACTIVE'] == False: elif system['ACTIVE'] == False:
_stats_table[_bridge][system['SYSTEM']]['ACTIVE'] = 'Disconnected' _stats_table[_bridge][system['SYSTEM']]['ACTIVE'] = 'Disconnected'
_stats_table[_bridge][system['SYSTEM']]['COLOR'] = RED _stats_table[_bridge][system['SYSTEM']]['COLOR'] = RED
_stats_table[_bridge][system['SYSTEM']]['BGCOLOR'] = WHITE
for i in range(len(system['ON'])): for i in range(len(system['ON'])):
system['ON'][i] = str(int_id(system['ON'][i])) system['ON'][i] = str(int_id(system['ON'][i]))
@ -309,34 +313,54 @@ def build_stats():
build_time = now build_time = now
def rts_update(p): def rts_update(p):
action = p[1]
system = p[2]
timeSlot = int(p[6])
callType = p[0] callType = p[0]
sourceSub = int(p[5]) action = p[1]
sourcePeer = int(p[4]) trx = p[2]
destination = int(p[7]) system = p[3]
streamId = p[4]
sourcePeer = int(p[5])
sourceSub = int(p[6])
timeSlot = int(p[7])
destination = int(p[8])
'''
if trx == 'RX':
color = '00ff00'
elif trx == 'TX':
color = 'ff0000'
else:
color = '0000ff'
'''
if system in CTABLE['MASTERS']: if system in CTABLE['MASTERS']:
if sourcePeer in CTABLE['MASTERS'][system]['PEERS']: for peer in CTABLE['MASTERS'][system]['PEERS']:
if sourcePeer == peer:
color = '00ff00'
bgcolor = '000000'
else:
color = 'ff0000'
bgcolor = 'ffffff'
#color, bgcolor = '00ff00', '000000' if sourcePeer == peer else 'ff0000', '000000'
if action == 'START': if action == 'START':
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TS'] = True CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TS'] = True
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['COLOR'] = '00ff00' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['COLOR'] = color
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TYPE'] = callType CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['BGCOLOR'] = bgcolor
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SUB'] = sourceSub CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TYPE'] = callType
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SRC'] = sourcePeer CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SUB'] = sourceSub
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['DEST'] = destination CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SRC'] = peer
CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['DEST'] = destination
if action == 'END': if action == 'END':
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TS'] = False CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TS'] = False
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['COLOR'] = 'ffffff' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['COLOR'] = 'ffffff'
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['TYPE'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['BGCOLOR'] = '000000'
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SUB'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['TYPE'] = ''
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['SRC'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SUB'] = ''
CTABLE['MASTERS'][system]['PEERS'][sourcePeer][timeSlot]['DEST'] = '' CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['SRC'] = ''
CTABLE['MASTERS'][system]['PEERS'][peer][timeSlot]['DEST'] = ''
build_stats() build_stats()
else: else:
logger.warning('tried to update a tranmission for a peer not yet listed') logger.warning('tried to update a tranmission for a peer not yet listed')
# #
# 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
# #
@ -367,24 +391,25 @@ def process_message(_message):
logging.info('BRIDGE EVENT: {}'.format(repr(_message[1:]))) logging.info('BRIDGE EVENT: {}'.format(repr(_message[1:])))
p = _message[1:].split(",") p = _message[1:].split(",")
rts_update(p) rts_update(p)
if p[0] == 'GROUP VOICE': if p[0] == 'GROUP VOICE' and p[2] != 'TX':
if p[1] == 'END': if p[1] == 'END':
log_message = '{}: {} {}: SYS: {:12.12s} SRC: {:8.8s}; {:15.15s} TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s} Time: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids), p[8]) log_message = '{}: {} {}: SYS: {:12.12s} SRC: {:8.8s}; {:15.15s} TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s} Time: {}s'.format(_now, p[0], p[1], p[3], p[5], alias_call(int(p[5]), peer_ids), p[7], p[8], p[6], alias_short(int(p[6]), subscriber_ids), p[9])
elif p[1] == 'START': elif p[1] == 'START':
log_message = '{}: {} {}: SYS: {:12.12s} SRC: {:8.8s}; {:15.15s} TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids)) log_message = '{}: {} {}: SYS: {:12.12s} SRC: {:8.8s}; {:15.15s} TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s}'.format(_now, p[0], p[1], p[3], p[5], alias_call(int(p[5]), peer_ids), p[7], p[8], p[6], alias_short(int(p[6]), subscriber_ids))
elif p[1] == 'END WITHOUT MATCHING START': elif p[1] == 'END WITHOUT MATCHING START':
log_message = '{}: {} {} on SYSTEM {:12.12s}: SRC: {:8.8s}; {}:15.15s TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids)) log_message = '{}: {} {} on SYSTEM {:12.12s}: SRC: {:8.8s}; {}:15.15s TS: {} TGID: {:>5s} SUB: {:8.8s}; {:30.30s}'.format(_now, p[0], p[1], p[3], p[5], alias_call(int(p[5]), peer_ids), p[7], p[8], p[6], alias_short(int(p[6]), subscriber_ids))
else: else:
log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now) log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now)
else:
log_message = '{}: UNKNOWN LOG MESSAGE'.format(_now)
dashboard_server.broadcast('l' + log_message) dashboard_server.broadcast('l' + log_message)
LOGBUF.append(log_message) LOGBUF.append(log_message)
else:
logging.debug('{}: UNKNOWN LOG MESSAGE'.format(_now))
else: else:
logging.debug('got unknown opcode: {}, message: {}'.format(repr(opcode), repr(_message[1:]))) logging.debug('got unknown opcode: {}, message: {}'.format(repr(opcode), repr(_message[1:])))
def load_dictionary(_message): def load_dictionary(_message):
data = _message[1:] data = _message[1:]
return loads(data) return loads(data)