From 8e95c5e5279a06a809cc2634aa5c9f79f0457783 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Thu, 29 Sep 2016 06:32:24 -0400
Subject: [PATCH] Removed the packet_cache argument, it is no longer needed.
---
src/apex/cli.py | 3 +--
src/apex/plugins/apexparadigm/__init__.py | 7 +++----
src/apex/plugins/beacon/__init__.py | 7 +++----
src/apex/plugins/id/__init__.py | 7 +++----
src/apex/plugins/status/__init__.py | 7 +++----
5 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/apex/cli.py b/src/apex/cli.py
index f83970a..0ca49cc 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 6a6abe5..cf87b2c 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 b6da367..794d189 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 df6f496..48342f6 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 d91beea..83ce62d 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
--
GitLab