From 56062bb3d6738c2feae1668e237638f63883118b Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Thu, 29 Nov 2018 14:17:41 -0600 Subject: [PATCH] shorten call log messages --- web_tables.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web_tables.py b/web_tables.py index a55cf7d..d78c216 100755 --- a/web_tables.py +++ b/web_tables.py @@ -106,6 +106,16 @@ def alias_short(_id, _dict): return ', '.join(alias) else: return str(alias) + +def alias_call(_id, _dict): + alias = get_alias(_id, _dict, 'CALLSIGN') + if type(alias) == list: + for x,item in enumerate(alias): + if item == None: + alias.pop(x) + return ', '.join(alias) + else: + return str(alias) # Build the HBlink connections table def build_hblink_table(_config): @@ -239,11 +249,11 @@ def process_message(_message): p = _message[1:].split(",") if p[0] == 'GROUP VOICE': if p[1] == 'END': - log_message = '{}: {} {}: SYS: {:15.15s} SRC: {:8.8s} - {:20.20s} TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s} Time: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_short(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids), p[8]) + log_message = '{}: {} {}: SYS: {:15.15s} SRC: {:8.8s} - {:20.20s} TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s} 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]) elif p[1] == 'START': - log_message = '{}: {} {}: SYS: {:15.15s} SRC: {:8.8s} - {:20.20s} TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s}'.format(_now, p[0], p[1], p[2], p[4], alias_short(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids)) + log_message = '{}: {} {}: SYS: {:15.15s} SRC: {:8.8s} - {:20.20s} TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s}'.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)) elif p[1] == 'END WITHOUT MATCHING START': - log_message = '{}: {} {} on SYSTEM {:15.15s}: SRC: {:8.8s} - {}:20.20s TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s}'.format(_now, p[0], p[1], p[2], p[4], alias_short(int(p[4]), peer_ids), p[6], p[7], p[5], alias_short(int(p[5]), subscriber_ids)) + log_message = '{}: {} {} on SYSTEM {:15.15s}: SRC: {:8.8s} - {}:20.20s TS: {} TGID: {:>5s} SUB: {:8.8s} - {:25.25s}'.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)) else: log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now) else: