Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

debian/control

@@ -9,7 +9,11 @@ Homepage: https://forge.cadoles.com/Infra/risotto
 Package: python3-risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
+Depends: ${python:Depends}, ${misc:Depends},
+	python3-asyncpg,
+	python3-rougail,
+	python3-aiohttp,
+	python3-sdnotify
 Description: configuration manager libraries
 
 Package: risotto

script/risotto-server

@@ -1,13 +1,16 @@
 #!/usr/bin/env python3
+from sdnotify import SystemdNotifier
 from asyncio import get_event_loop
 from risotto import get_app
 
 
 if __name__ == '__main__':
+    notifier = SystemdNotifier()
     loop = get_event_loop()
     loop.run_until_complete(get_app(loop))
-    try:
     print('HTTP server ready')
+    notifier.notify("READY=1")
+    try:
         loop.run_forever()
     except KeyboardInterrupt:
         pass

src/risotto/controller.py

@@ -48,6 +48,31 @@ class Controller:
                                  **kwargs,
                                  )
 
+    @staticmethod
+    async def check_role(self,
+                         uri: str,
+                         username: str,
+                         **kwargs: dict,
+                         ) -> None:
+        # create a new config
+        async with await Config(dispatcher.option) as config:
+            await config.property.read_write()
+            await config.option('message').value.set(uri)
+            subconfig = config.option(uri)
+            for key, value in kwargs.items():
+                try:
+                    await subconfig.option(key).value.set(value)
+                except AttributeError:
+                    if get_config()['global']['debug']:
+                        print_exc()
+                    raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
+                except ValueOptionError as err:
+                    raise ValueError(_(f'invalid parameter in "{uri}": {err}'))
+            await dispatcher.check_role(subconfig,
+                                        username,
+                                        uri,
+                                        )
+
     async def on_join(self,
                       risotto_context,
                       ):

src/risotto/dispatcher.py

@@ -342,7 +342,8 @@ class Dispatcher(register.RegisterDispatcher,
     async def check_role(self,
                          config: Config,
                          user_login: str,
-                         uri: str) -> None:
+                         uri: str,
+                         ) -> None:
         async with self.pool.acquire() as connection:
             async with connection.transaction():
                 # Verify if user exists and get ID

src/risotto/http.py

@@ -29,7 +29,8 @@ def create_context(request):
 
 
 def register(version: str,
-             path: str):
+             path: str,
+             ):
     """ Decorator to register function to the http route
     """
     def decorator(function):
@@ -41,7 +42,9 @@ def register(version: str,
 
 
 class extra_route_handler:
-    async def __new__(cls, request):
+    async def __new__(cls,
+                      request,
+                      ):
         kwargs = dict(request.match_info)
         kwargs['request'] = request
         kwargs['risotto_context'] = create_context(request)
@@ -96,11 +99,13 @@ async def handle(request):
             print_exc()
         raise HTTPInternalServerError(reason=str(err))
     return Response(text=dumps({'response': text}),
-                    content_type='application/json')
+                    content_type='application/json',
+                    )
 
 
 async def api(request,
-              risotto_context):
+              risotto_context,
+              ):
     global TIRAMISU
     if not TIRAMISU:
         # check all URI that have an associated role
@@ -152,7 +157,8 @@ async def get_app(loop):
     for version in versions:
         api_route = {'function': api,
                      'version': version,
-                     'path': f'/api/{version}'}
+                     'path': f'/api/{version}',
+                     }
         extra_handler = type(api_route['path'], (extra_route_handler,), api_route)
         routes.append(get(api_route['path'], extra_handler))
         print(f'  - {api_route["path"]} (http_get)')
@@ -174,7 +180,10 @@ async def get_app(loop):
     await dispatcher.register_remote()
     print()
     await dispatcher.on_join()
-    return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])
+    return await loop.create_server(app.make_handler(),
+                                    '*',
+                                    get_config()['http_server']['port'],
+                                    )
 
 
 TIRAMISU = None

src/risotto/register.py

@@ -7,6 +7,7 @@ from typing import Callable, Optional, List
 from asyncpg import create_pool
 from json import dumps, loads
 from pkg_resources import iter_entry_points
+from traceback import print_exc
 import risotto
 from .utils import _
 from .error import RegistrationError
@@ -277,7 +278,7 @@ class RegisterDispatcher:
         try:
             self.injected_self[submodule_name] = module.Risotto(test)
         except AttributeError as err:
-            raise RegistrationError(_(f'unable to register the module {submodule_name}, this module must have Risotto class'))
+            print(_(f'unable to register the module {submodule_name}, this module must have Risotto class'))
 
     def validate(self):
         """ check if all messages have a function
@@ -319,7 +320,13 @@ class RegisterDispatcher:
                     await log.info_msg(risotto_context,
                                        None,
                                        info_msg)
+                    try:
                         await module.on_join(risotto_context)
+                    except Exception as err:
+                        if get_config()['global']['debug']:
+                            print_exc()
+                        msg = _(f'on_join returns an error in module {submodule_name}: {err}')
+                        await log.error_msg(risotto_context, {}, msg)
 
     async def load(self):
         # valid function's arguments