diff --git a/src/apex/cli.py b/src/apex/cli.py index f83970a10512ea19a28996ca579e69c5ad1ebb07..0ca49cc739531591a79188dac73d8fa3634b59c8 100644 --- a/src/apex/cli.py +++ b/src/apex/cli.py @@ -170,7 +170,6 @@ def main(verbose, configfile): click.echo("Press ctrl + c at any time to exit") - packet_cache = cachetools.TTLCache(10000, 5) # start the plugins try: plugin_loaders = get_plugins() @@ -181,7 +180,7 @@ def main(verbose, configfile): click.echo('Plugin found at the following location: %s' % repr(plugin_loader)) loaded_plugin = load_plugin(plugin_loader) plugin_modules.append(loaded_plugin) - new_thread = threading.Thread(target=loaded_plugin.start, args=(config, port_map, packet_cache, aprsis)) + new_thread = threading.Thread(target=loaded_plugin.start, args=(config, port_map, aprsis)) new_thread.start() plugin_threads.append(new_thread) except IOError: diff --git a/src/apex/plugins/apexparadigm/__init__.py b/src/apex/plugins/apexparadigm/__init__.py index 6a6abe50f6ef247f5f7085583b950e4329a408b4..cf87b2c0ac5d818687038c9c69a5c6e7f6357a45 100644 --- a/src/apex/plugins/apexparadigm/__init__.py +++ b/src/apex/plugins/apexparadigm/__init__.py @@ -17,9 +17,9 @@ __version__ = '0.0.4' plugin = None -def start(config, port_map, packet_cache, aprsis): +def start(config, port_map, aprsis): global plugin - plugin = ApexParadigmPlugin(config, port_map, packet_cache, aprsis) + plugin = ApexParadigmPlugin(config, port_map, aprsis) plugin.run() @@ -35,9 +35,8 @@ class ApexParadigmPlugin(object): BAND_PATH_REGEX = re.compile(r'(\d{1,4})M(\d{0,3})') - def __init__(self, config, port_map, packet_cache, aprsis): + def __init__(self, config, port_map, aprsis): self.port_map = port_map - self.packet_cache = packet_cache self.aprsis = aprsis def __passive_digipeat(self, frame, recv_port, recv_port_name): diff --git a/src/apex/plugins/beacon/__init__.py b/src/apex/plugins/beacon/__init__.py index b6da367221367bb9c3e17fd3b38d998eaee5da06..794d1899d00f4a6763157547acf96c20101e5b61 100644 --- a/src/apex/plugins/beacon/__init__.py +++ b/src/apex/plugins/beacon/__init__.py @@ -16,9 +16,9 @@ __version__ = '0.0.4' plugin = None -def start(config, port_map, packet_cache, aprsis): +def start(config, port_map, aprsis): global plugin - plugin = BeaconPlugin(config, port_map, packet_cache, aprsis) + plugin = BeaconPlugin(config, port_map, aprsis) plugin.run() @@ -32,9 +32,8 @@ def stop(): class BeaconPlugin(object): - def __init__(self, config, port_map, packet_cache, aprsis): + def __init__(self, config, port_map, aprsis): self.port_map = port_map - self.packet_cache = packet_cache self.aprsis = aprsis self.running = False diff --git a/src/apex/plugins/id/__init__.py b/src/apex/plugins/id/__init__.py index df6f4967b1121f157bbbc9b375a36585d8c19a24..48342f6b3dd4a4ed6554c4fb18a9d5161b355dcf 100644 --- a/src/apex/plugins/id/__init__.py +++ b/src/apex/plugins/id/__init__.py @@ -16,9 +16,9 @@ __version__ = '0.0.4' plugin = None -def start(config, port_map, packet_cache, aprsis): +def start(config, port_map, aprsis): global plugin - plugin = IdPlugin(config, port_map, packet_cache, aprsis) + plugin = IdPlugin(config, port_map, aprsis) plugin.run() @@ -32,9 +32,8 @@ def stop(): class IdPlugin(object): - def __init__(self, config, port_map, packet_cache, aprsis): + def __init__(self, config, port_map, aprsis): self.port_map = port_map - self.packet_cache = packet_cache self.aprsis = aprsis self.running = False diff --git a/src/apex/plugins/status/__init__.py b/src/apex/plugins/status/__init__.py index d91beea5468756cc0a48c5fe0f60b18f89eb604b..83ce62de52cf649b14c264a54ce5ace748045d60 100644 --- a/src/apex/plugins/status/__init__.py +++ b/src/apex/plugins/status/__init__.py @@ -16,9 +16,9 @@ __version__ = '0.0.4' plugin = None -def start(config, port_map, packet_cache, aprsis): +def start(config, port_map, aprsis): global plugin - plugin = StatusPlugin(config, port_map, packet_cache, aprsis) + plugin = StatusPlugin(config, port_map, aprsis) plugin.run() @@ -32,9 +32,8 @@ def stop(): class StatusPlugin(object): - def __init__(self, config, port_map, packet_cache, aprsis): + def __init__(self, config, port_map, aprsis): self.port_map = port_map - self.packet_cache = packet_cache self.aprsis = aprsis self.running = False