From 6933c3cda07997ec0c6c25843f4a305140e3f2c1 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 17 Dec 2014 23:37:27 +0100 Subject: [PATCH 1/4] [IMP] logging level is not customizable; --- sentry_logger/__init__.py | 9 ++++++++- sentry_logger/__openerp__.py | 14 ++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sentry_logger/__init__.py b/sentry_logger/__init__.py index 9c8c23e69..c1c2142cd 100644 --- a/sentry_logger/__init__.py +++ b/sentry_logger/__init__.py @@ -26,6 +26,8 @@ import cgitb from openerp.tools import config from openerp.addons.web.controllers.main import Session +_DEFAULT_LOGGING_LEVEL = logging.ERROR + try: from .odoo_sentry_client import OdooClient from .odoo_sentry_handler import OdooSentryHandler @@ -40,12 +42,17 @@ try: cgitb.enable() # Get DSN info from config file or ~/.openerp_serverrc (recommended) dsn = config.get('sentry_dsn') + level = config.get('sentry_logging_level') + if not level: + level = _DEFAULT_LOGGING_LEVEL + else: + level = eval(level) # Create Client client = OdooClient( dsn=dsn, processors=processors, ) - handler = OdooSentryHandler(client, level=logging.ERROR) + handler = OdooSentryHandler(client, level=level) root_logger.addHandler(handler) else: root_logger.warn(u"Sentry DSN not defined in config file") diff --git a/sentry_logger/__openerp__.py b/sentry_logger/__openerp__.py index ea9fe08c0..43bb13fc5 100644 --- a/sentry_logger/__openerp__.py +++ b/sentry_logger/__openerp__.py @@ -27,12 +27,18 @@ 'description': """ Sentry ====== - Integration with Sentry Error reporting engine. -Insert sentry DSN to ~/.openerp_serverrc with value: - sentry_dsn = sync+ - +Settings: +--------- +You have to add extra parametesr in your odoo config file (~/.openerp_serverrc) + * mandatory parameters: + * Insert sentry DSN with value: + sentry_dsn = sync+ + * optional parameters: + * Define the level of log sent to sentry: + sentry_logging_level = logging.WARNING + (by default loggin.ERROR) Optional Dependencies --------------------- From 830c8b5a308c17746b3e04c8a87ea31961ad3845 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 18 Dec 2014 00:10:20 +0100 Subject: [PATCH 2/4] [FIX] comment; --- sentry_logger/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_logger/__openerp__.py b/sentry_logger/__openerp__.py index 43bb13fc5..098d8d07d 100644 --- a/sentry_logger/__openerp__.py +++ b/sentry_logger/__openerp__.py @@ -31,7 +31,7 @@ Integration with Sentry Error reporting engine. Settings: --------- -You have to add extra parametesr in your odoo config file (~/.openerp_serverrc) +You have to add extra parameters in your odoo config file (~/.openerp_serverrc) * mandatory parameters: * Insert sentry DSN with value: sentry_dsn = sync+ From b1e210d7b1da2b163fb5c1c954c93ebe718c851c Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 18 Dec 2014 15:35:18 +0100 Subject: [PATCH 3/4] [FIX] typo --- sentry_logger/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_logger/__openerp__.py b/sentry_logger/__openerp__.py index 098d8d07d..fb237109c 100644 --- a/sentry_logger/__openerp__.py +++ b/sentry_logger/__openerp__.py @@ -38,7 +38,7 @@ You have to add extra parameters in your odoo config file (~/.openerp_serverrc) * optional parameters: * Define the level of log sent to sentry: sentry_logging_level = logging.WARNING - (by default loggin.ERROR) + (by default logging.ERROR) Optional Dependencies --------------------- From 17eb1f2b34249b667cb4608298cf87686beaa058 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 18 Dec 2014 16:07:08 +0100 Subject: [PATCH 4/4] [FIX] remove dangerous call to 'eval' function; --- sentry_logger/__init__.py | 7 +++---- sentry_logger/__openerp__.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sentry_logger/__init__.py b/sentry_logger/__init__.py index c1c2142cd..6c8a150f5 100644 --- a/sentry_logger/__init__.py +++ b/sentry_logger/__init__.py @@ -42,11 +42,10 @@ try: cgitb.enable() # Get DSN info from config file or ~/.openerp_serverrc (recommended) dsn = config.get('sentry_dsn') - level = config.get('sentry_logging_level') - if not level: + try: + level = getattr(logging, config.get('sentry_logging_level')) + except (AttributeError, TypeError): level = _DEFAULT_LOGGING_LEVEL - else: - level = eval(level) # Create Client client = OdooClient( dsn=dsn, diff --git a/sentry_logger/__openerp__.py b/sentry_logger/__openerp__.py index fb237109c..4b00e3341 100644 --- a/sentry_logger/__openerp__.py +++ b/sentry_logger/__openerp__.py @@ -37,8 +37,8 @@ You have to add extra parameters in your odoo config file (~/.openerp_serverrc) sentry_dsn = sync+ * optional parameters: * Define the level of log sent to sentry: - sentry_logging_level = logging.WARNING - (by default logging.ERROR) + sentry_logging_level = WARNING + (by default ERROR) Optional Dependencies ---------------------