From 0079ad1baa450a5d315d1e6195267c8d17ac80ac Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Wed, 28 Jun 2017 16:07:29 -0500 Subject: [PATCH] Change Network Logging Format --- confbridge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/confbridge.py b/confbridge.py index 5cac329..877aa17 100755 --- a/confbridge.py +++ b/confbridge.py @@ -352,7 +352,7 @@ class confbridgeIPSC(IPSC): self.call_start = now self._logger.info('(%s) GROUP VOICE START: CallID: %s PEER: %s, SUB: %s, TS: %s, TGID: %s', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group)) if self._CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': - self._report.send_bridgeEvent('({}) GROUP VOICE START: CallID: {} PEER: {}, SUB: {}, TS: {}, TGID: {}'.format(self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group))) + self._report.send_bridgeEvent(['Group Voice Call Start', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group)]) # Action happens on un-key if _burst_data_type == BURST_DATA_TYPE['VOICE_TERM']: @@ -360,11 +360,11 @@ class confbridgeIPSC(IPSC): self.call_duration = now - self.call_start self._logger.info('(%s) GROUP VOICE END: CallID: %s PEER: %s, SUB: %s, TS: %s, TGID: %s Duration: %.2fs', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group), self.call_duration) if self._CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': - self._report.send_bridgeEvent('({}) GROUP VOICE END: CallID: {} PEER: {}, SUB: {}, TS: {}, TGID: {} Duration: {:.2f}s'.format(self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group), self.call_duration)) + self._report.send_bridgeEvent(['Group Voice Call End', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group), self.call_duration)]) else: self._logger.warning('(%s) GROUP VOICE END WITHOUT MATCHING START: CallID: %s PEER: %s, SUB: %s, TS: %s, TGID: %s', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group)) if self._CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': - self._report.send_bridgeEvent('(%s) GROUP VOICE END WITHOUT MATCHING START: CallID: %s PEER: %s, SUB: %s, TS: %s, TGID: %s'.format(self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group))) + self._report.send_bridgeEvent(['Group Voice End Without Matching Start', self._system, int_id(_seq_id), int_id(_peerid), int_id(_src_sub), _ts, int_id(_dst_group)]) # Iterate the rules dictionary