From ae29844809d0fe174f4e98832238a9a79fc8ef61 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Tue, 30 Jun 2015 20:36:14 -0500 Subject: [PATCH] fix bridge.py reporting --- bridge.py | 11 +++++++++-- dmrlink.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bridge.py b/bridge.py index 6a9e64d..51ca499 100755 --- a/bridge.py +++ b/bridge.py @@ -36,7 +36,7 @@ from binascii import b2a_hex as h from time import time import sys -from dmrlink import IPSC, NETWORK, networks, dmr_nat, logger, hex_str_3, hex_str_4, int_id +from dmrlink import IPSC, NETWORK, networks, REPORTS, reporting_loop, dmr_nat, logger, hex_str_3, hex_str_4, int_id __author__ = 'Cortney T. Buffington, N0MJS' __copyright__ = 'Copyright (c) 2013-2015 Cortney T. Buffington, N0MJS and the K0USY Group' @@ -351,9 +351,16 @@ class bridgeIPSC(IPSC): if __name__ == '__main__': logger.info('DMRlink \'bridge.py\' (c) 2013-2015 N0MJS & the K0USY Group - SYSTEM STARTING...') + + # INITIALIZE AN IPSC OBJECT (SELF SUSTAINING) FOR EACH CONFIGUED IPSC for ipsc_network in NETWORK: if NETWORK[ipsc_network]['LOCAL']['ENABLED']: networks[ipsc_network] = bridgeIPSC(ipsc_network) reactor.listenUDP(NETWORK[ipsc_network]['LOCAL']['PORT'], networks[ipsc_network], interface=NETWORK[ipsc_network]['LOCAL']['IP']) - + + # INITIALIZE THE REPORTING LOOP IF CONFIGURED + if REPORTS['REPORT_NETWORKS']: + reporting = task.LoopingCall(reporting_loop) + reporting.start(REPORTS['REPORT_INTERVAL']) + reactor.run() \ No newline at end of file diff --git a/dmrlink.py b/dmrlink.py index ffeb55c..52d01c7 100755 --- a/dmrlink.py +++ b/dmrlink.py @@ -1323,4 +1323,4 @@ if __name__ == '__main__': reporting = task.LoopingCall(reporting_loop) reporting.start(REPORTS['REPORT_INTERVAL']) - reactor.run() + reactor.run() \ No newline at end of file