Merge branch 'mitre:master' into master

mitre · Apr 29, 2024 · 02870a0 · 02870a0
2 parents 8b048f2 + 4d3eae2
commit 02870a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/service/app_svc.py b/app/service/app_svc.py
@@ -111,7 +111,7 @@ async def load(p):
                 await self.get_service('data_svc').store(plugin)
                 self._loaded_plugins.append(plugin)
 
-            if plugin.name in self.get_config('plugins'):
+            if plugin.name in self.get_config('plugins') or plugin.name == 'magma':
                 await plugin.enable(self.get_services())
                 self.log.info('Enabled plugin: %s' % plugin.name)
 

diff --git a/plugins/human b/plugins/human
diff --git a/server.py b/server.py
@@ -99,7 +99,7 @@ def run_tasks(services, run_vue_server=False):
         loop.run_until_complete(start_vue_dev_server())
     try:
         logging.info("All systems ready.")
-        logging.info(print_rich_banner())
+        print_rich_banner()
         loop.run_forever()
     except KeyboardInterrupt:
         loop.run_until_complete(