From 8dd2e30627dd09bed7783ff12bd50b657cf7fe7b Mon Sep 17 00:00:00 2001 From: Waldek Date: Tue, 21 Jul 2020 09:55:48 +0200 Subject: [PATCH] Update monitor.py --- monitor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monitor.py b/monitor.py index b413d03..162c007 100644 --- a/monitor.py +++ b/monitor.py @@ -597,12 +597,12 @@ def process_message(_bmessage): p = _message[1:].split(",") rts_update(p) if p[0] == 'GROUP VOICE' and p[2] != 'TX': - opbfilter = get_opbf() - if p[1] == 'END' and p[5] not in opbfilter: + if p[1] == 'END': log_message = '{} {} {} SYS: {:8.8s} SRC: {:9.9s}; {:9.9s} TS: {} TGID: {:7.7s} {:17.17s} SUB: {:9.9s}; {:18.18s} Time: {}s '.format(_now[10:19], p[0][6:], p[1], p[3], p[5], alias_call(int(p[5]), subscriber_ids), p[7],p[8],alias_tgid(int(p[8]),talkgroup_ids), p[6], alias_short(int(p[6]), subscriber_ids), int(float(p[9]))) # log only to file if system is NOT OpenBridge event (not logging open bridge system, name depends on your OB definitions) AND transmit time is LONGER as 2sec (make sense for very short transmits) if LASTHEARD_INC: - if int(float(p[9]))> 2: + opbfilter = get_opbf() + if int(float(p[9]))> 2 and p[5] not in opbfilter: log_lh_message = '{},{},{},{},{},{},{},TS{},TG{},{},{},{}'.format(_now, p[9], p[0], p[1], p[3], p[5], alias_call(int(p[5]), subscriber_ids), p[7], p[8],alias_tgid(int(p[8]),talkgroup_ids),p[6], alias_short(int(p[6]), subscriber_ids)) lh_logfile = open(LOG_PATH+"lastheard.log", "a") lh_logfile.write(log_lh_message + '\n')