From 27031dbf0ed89f3084b9b357893c862a5ac7b280 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 24 Apr 2021 14:15:54 +0200 Subject: [PATCH] log_connexion --- src/risotto/dispatcher.py | 97 +++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/src/risotto/dispatcher.py b/src/risotto/dispatcher.py index 929d958..b6969b8 100644 --- a/src/risotto/dispatcher.py +++ b/src/risotto/dispatcher.py @@ -260,58 +260,67 @@ class PublishDispatcher: False, False, ) - async with self.pool.acquire() as connection: - await connection.set_type_codec( + async with self.pool.acquire() as log_connection: + await log_connection.set_type_codec( 'json', encoder=dumps, decoder=loads, schema='pg_catalog' ) - risotto_context.connection = connection - for function_obj in self.messages[version][message]['functions']: - function_name = function_obj['function'].__name__ - info_msg = _(f"call function {function_obj['full_module_name']}.{function_name}") - try: - async with connection.transaction(): + async with log_connection.transaction(): + risotto_context.log_connection = log_connection + async with self.pool.acquire() as connection: + await connection.set_type_codec( + 'json', + encoder=dumps, + decoder=loads, + schema='pg_catalog' + ) + risotto_context.connection = connection + for function_obj in self.messages[version][message]['functions']: + function_name = function_obj['function'].__name__ + info_msg = _(f"call function {function_obj['full_module_name']}.{function_name}") try: - await log.start(risotto_context, - kwargs, - info_msg, - ) - await self.check_message_type(risotto_context, - kwargs, - ) - await self.launch(risotto_context, - kwargs, - config_arguments, - function_obj, - ) - # log the success - await log.success(risotto_context) - except CallError as err: + async with connection.transaction(): + try: + await log.start(risotto_context, + kwargs, + info_msg, + ) + await self.check_message_type(risotto_context, + kwargs, + ) + await self.launch(risotto_context, + kwargs, + config_arguments, + function_obj, + ) + # log the success + await log.success(risotto_context) + except CallError as err: + if get_config()['global']['debug']: + print_exc() + await log.failed(risotto_context, + str(err), + ) + except CallError: + pass + except Exception as err: + # if there is a problem with arguments, log and do nothing if get_config()['global']['debug']: print_exc() - await log.failed(risotto_context, - str(err), - ) - except CallError: - pass - except Exception as err: - # if there is a problem with arguments, log and do nothing - if get_config()['global']['debug']: - print_exc() - async with self.pool.acquire() as connection: - await connection.set_type_codec( - 'json', - encoder=dumps, - decoder=loads, - schema='pg_catalog' - ) - risotto_context.connection = connection - async with connection.transaction(): - await log.failed(risotto_context, - str(err), - ) + async with self.pool.acquire() as connection: + await connection.set_type_codec( + 'json', + encoder=dumps, + decoder=loads, + schema='pg_catalog' + ) + risotto_context.connection = connection + async with connection.transaction(): + await log.failed(risotto_context, + str(err), + ) class Dispatcher(register.RegisterDispatcher,