Infra
/
risotto
9
0
Fork 1
Code Issues 1 Releases Wiki Activity

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

This commit is contained in:
Emmanuel Garette 2020-09-20 21:33:15 +02:00
parent 1b9d87fa53 279e3a7c4c
commit 98c77bf719
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/risotto/dispatcher.py
View File

@ -394,10 +394,9 @@ class Dispatcher(register.RegisterDispatcher,
) -> Optional[Dict]: ) -> Optional[Dict]:
# so send the message # so send the message
function = function_obj['function'] function = function_obj['function']
submodule_name = function_obj['module'] risotto_context.module = function_obj['module'].split('.', 1)[0]
function_name = function.__name__ function_name = function.__name__
risotto_context.module = submodule_name.split('.', 1)[0] info_msg = _(f"in function {function_obj['full_module_name']}.{function_name}")
info_msg = _(f'in module {submodule_name}.{function_name}')
# build argument for this function # build argument for this function
if risotto_context.type == 'rpc': if risotto_context.type == 'rpc':
kw = config_arguments kw = config_arguments

13
src/risotto/register.py
View File

@ -199,7 +199,8 @@ class RegisterDispatcher:
raise RegistrationError(_(f'the message {message} not exists')) raise RegistrationError(_(f'the message {message} not exists'))
# xxx submodule can only be register with v1.yyy.xxx..... message # xxx submodule can only be register with v1.yyy.xxx..... message
risotto_module_name, submodule_name = function.__module__.split('.')[-3:-1] full_module_name = function.__module__
risotto_module_name, submodule_name = full_module_name.split('.')[-3:-1]
module_name = risotto_module_name.split('_')[-1] module_name = risotto_module_name.split('_')[-1]
message_module, message_submodule, message_name = message.split('.', 2) message_module, message_submodule, message_name = message.split('.', 2)
if message_module not in self.risotto_modules: if message_module not in self.risotto_modules:
@ -224,6 +225,7 @@ class RegisterDispatcher:
register(version, register(version,
message, message,
f'{module_name}.{submodule_name}', f'{module_name}.{submodule_name}',
full_module_name,
function, function,
function_args, function_args,
notification, notification,
@ -233,11 +235,13 @@ class RegisterDispatcher:
version: str, version: str,
message: str, message: str,
module_name: str, module_name: str,
full_module_name: str,
function: Callable, function: Callable,
function_args: list, function_args: list,
notification: Optional[str], notification: Optional[str],
): ):
self.messages[version][message]['module'] = module_name self.messages[version][message]['module'] = module_name
self.messages[version][message]['full_module_name'] = full_module_name
self.messages[version][message]['function'] = function self.messages[version][message]['function'] = function
self.messages[version][message]['arguments'] = function_args self.messages[version][message]['arguments'] = function_args
if notification: if notification:
@ -247,6 +251,7 @@ class RegisterDispatcher:
version: str, version: str,
message: str, message: str,
module_name: str, module_name: str,
full_module_name: str,
function: Callable, function: Callable,
function_args: list, function_args: list,
notification: Optional[str], notification: Optional[str],
@ -255,8 +260,10 @@ class RegisterDispatcher:
self.messages[version][message]['functions'] = [] self.messages[version][message]['functions'] = []
dico = {'module': module_name, dico = {'module': module_name,
'full_module_name': full_module_name,
'function': function, 'function': function,
'arguments': function_args} 'arguments': function_args,
}
if notification and notification: if notification and notification:
dico['notification'] = notification dico['notification'] = notification
self.messages[version][message]['functions'].append(dico) self.messages[version][message]['functions'].append(dico)
@ -309,7 +316,7 @@ class RegisterDispatcher:
risotto_context.type = None risotto_context.type = None
risotto_context.connection = connection risotto_context.connection = connection
risotto_context.module = submodule_name.split('.', 1)[0] risotto_context.module = submodule_name.split('.', 1)[0]
info_msg = _(f'in module risotto_{submodule_name}.on_join') info_msg = _(f'in function risotto_{submodule_name}.on_join')
await log.info_msg(risotto_context, await log.info_msg(risotto_context,
None, None,
info_msg) info_msg)