pluginserver 0.6.2__tar.gz → 0.7.0__tar.gz

{pluginserver-0.6.2/pluginserver.egg-info → pluginserver-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pluginserver
-Version: 0.6.2
+Version: 0.7.0
 Summary: Plugin-driven API server
 Home-page: https://github.com/nicciniamh/pluginserver
 Author: Nicole Stevens

{pluginserver-0.6.2 → pluginserver-0.7.0}/plugincore/baseplugin.py

@@ -30,6 +30,9 @@ class BasePlugin:
                 self._auth_type = 'plugin'
         self.args = dict(kwargs)
 
+    def terminate_plugin(self):
+        pass
+
     def _check_auth(self,data):
         toktype = 'Undefined'
         def get_token(data):
@@ -78,7 +81,7 @@ class BasePlugin:
         if auth_check:
             result = self.request_handler(**data)
             code, response = await result if inspect.isawaitable(result) else result
-            print(f"Got {code} - {response}")
+            #print(f"Got {code} - {response}")
         else:
             code, response = 403, {'error': 'unauthorized'}
         if not isinstance(response,web.Response):

{pluginserver-0.6.2 → pluginserver-0.7.0}/plugincore/pluginmanager.py

@@ -66,6 +66,10 @@ class PluginManager:
             return
 
         # Try to remove the module
+        try:
+            plugin.terminate_plugin()
+        except Exception as e:
+            print(f"Exception {type(e)} Unloading plugin - terminate_plugin threw {e}")
         module_name = plugin.__class__.__module__
         module_file = os.path.basename(module_name + ".py")
         print(f"Removing plugin {plugin_id} from module {module_name}")

{pluginserver-0.6.2 → pluginserver-0.7.0}/plugincore/pserv.py

@@ -18,6 +18,21 @@ import aiohttp_cors
 from aiohttp import web
 
 corsobj = CORS()
+
+async def on_shutdown(*args):
+    """
+    call terminate_plugin for active plugins
+    """
+    global manager
+    print(("Sending plugins the terminate signal"))
+    for id, plugin in manager.plugins.items():
+        try:
+            plugin.terminate_plugin()
+        except Exception as e:
+            print(f"{type(e)} Exception unloading plugin id {id}")
+    print("Waiting for tasks")
+    await  asyncio.sleep(3)
+
 def main():
     global manager
     global globalCfg
@@ -86,7 +101,11 @@ def main():
     corsobj.setup(app,globalCfg)
 
     app.add_routes(routes)
-    web.run_app(app, host=globalCfg.network.bindto, port=globalCfg.network.port, ssl_context=ssl_ctx)
+    app.on_shutdown.append(on_shutdown)
+    try:
+        web.run_app(app, host=globalCfg.network.bindto, port=globalCfg.network.port, ssl_context=ssl_ctx)
+    except KeyboardInterrupt:
+        on_shutdown()
 
 # --- Auth Helper ---
 def check_auth(data, config):

{pluginserver-0.6.2 → pluginserver-0.7.0/pluginserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pluginserver
-Version: 0.6.2
+Version: 0.7.0
 Summary: Plugin-driven API server
 Home-page: https://github.com/nicciniamh/pluginserver
 Author: Nicole Stevens

{pluginserver-0.6.2 → pluginserver-0.7.0}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='pluginserver',
-    version='0.6.2',
+    version='0.7.0',
     packages=['plugincore'],
     include_package_data=True,
     description='Plugin-driven API server',