hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-07-29 11:52:28 -04:00
Code Issues Projects Releases Wiki Activity

Fixed loading of plugins for server

Browse Source 
Some instances the plugins failed to load
This commit is contained in:
Hemna 2023-04-20 14:31:50 -04:00
parent 17d9c06b07
commit e21e2a7c50
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aprsd/cmds/server.py
View File

@ -57,6 +57,14 @@ def server(ctx, flush):
# Dump all the config options now. # Dump all the config options now.
CONF.log_opt_values(LOG, logging.DEBUG) CONF.log_opt_values(LOG, logging.DEBUG)
message_plugins = plugin_manager.get_message_plugins()
watchlist_plugins = plugin_manager.get_watchlist_plugins()
LOG.info("Message Plugins enabled and running:")
for p in message_plugins:
LOG.info(p)
LOG.info("Watchlist Plugins enabled and running:")
for p in watchlist_plugins:
LOG.info(p)
# Make sure we have 1 client transport enabled # Make sure we have 1 client transport enabled
if not client.factory.is_client_enabled(): if not client.factory.is_client_enabled():

16
aprsd/plugin.py
View File

@ -207,6 +207,7 @@ class APRSDRegexCommandPluginBase(APRSDPluginBase, metaclass=abc.ABCMeta):
@hookimpl @hookimpl
def filter(self, packet: packets.core.MessagePacket): def filter(self, packet: packets.core.MessagePacket):
LOG.info(f"{self.__class__.__name__} called")
if not self.enabled: if not self.enabled:
result = f"{self.__class__.__name__} isn't enabled" result = f"{self.__class__.__name__} isn't enabled"
LOG.warning(result) LOG.warning(result)
@ -324,9 +325,6 @@ class PluginManager:
# the pluggy PluginManager for all WatchList plugins # the pluggy PluginManager for all WatchList plugins
_watchlist_pm = None _watchlist_pm = None
# aprsd config dict
config = None
lock = None lock = None
def __new__(cls, *args, **kwargs): def __new__(cls, *args, **kwargs):
@ -335,14 +333,9 @@ class PluginManager:
cls._instance = super().__new__(cls) cls._instance = super().__new__(cls)
# Put any initialization here. # Put any initialization here.
cls._instance.lock = threading.Lock() cls._instance.lock = threading.Lock()
cls._instance._init()
return cls._instance return cls._instance
def __init__(self, config=None):
self._init()
self.obj_list = []
if config:
self.config = config
def _init(self): def _init(self):
self._pluggy_pm = pluggy.PluginManager("aprsd") self._pluggy_pm = pluggy.PluginManager("aprsd")
self._pluggy_pm.add_hookspecs(APRSDPluginSpec) self._pluggy_pm.add_hookspecs(APRSDPluginSpec)
@ -479,6 +472,8 @@ class PluginManager:
def run(self, packet: packets.core.MessagePacket): def run(self, packet: packets.core.MessagePacket):
"""Execute all the plugins run method.""" """Execute all the plugins run method."""
with self.lock: with self.lock:
LOG.info(f"PM {self}")
LOG.info(f" plugins {self.get_message_plugins()}")
return self._pluggy_pm.hook.filter(packet=packet) return self._pluggy_pm.hook.filter(packet=packet)
def run_watchlist(self, packet: packets.core.Packet): def run_watchlist(self, packet: packets.core.Packet):
@ -494,7 +489,8 @@ class PluginManager:
def register_msg(self, obj): def register_msg(self, obj):
"""Register the plugin.""" """Register the plugin."""
self._pluggy_pm.register(obj) with self.lock:
self._pluggy_pm.register(obj)
def get_plugins(self): def get_plugins(self):
plugin_list = [] plugin_list = []