changeset e27155605c26 in modules/marketing_automation:default
details:
https://hg.tryton.org/modules/marketing_automation?cmd=changeset;node=e27155605c26
description:
Avoid failure on invalid domain
We must ensure the domain can be used for search in its validation.
But also former domain can become invalid after upgrade, it should not
block
all the processes but only being logged as an error.
issue8931
review272661003
diffstat:
marketing_automation.py | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diffs (74 lines):
diff -r 7c6e27f559cc -r e27155605c26 marketing_automation.py
--- a/marketing_automation.py Sun Jan 12 10:34:10 2020 +0100
+++ b/marketing_automation.py Mon Jan 20 22:27:31 2020 +0100
@@ -1,6 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
import datetime
+import logging
import time
import uuid
from email.header import Header
@@ -46,6 +47,7 @@
USE_SSL = bool(config.get('ssl', 'certificate'))
URL_BASE = config.get('marketing', 'automation_base', default=http_host())
URL_OPEN = urljoin(URL_BASE, '/m/empty.gif')
+logger = logging.getLogger(__name__)
def _formataddr(name, email):
@@ -132,7 +134,7 @@
else:
others.append(scenario)
- count = {name: dict.fromkeys(map(int, scenarios), 0) for name in names}
+ count = {name: dict.fromkeys(map(int, scenarios)) for name in names}
for sub in grouped_slice(others):
cursor.execute(*record.select(
record.scenario,
@@ -148,8 +150,11 @@
for scenario in drafts:
Model = pool.get(scenario.model)
domain = PYSONDecoder({}).decode(scenario.domain)
- count['record_count'][scenario.id] = Model.search(
- domain, count=True)
+ try:
+ count['record_count'][scenario.id] = Model.search(
+ domain, count=True)
+ except Exception:
+ pass
return count
@classmethod
@@ -159,10 +164,13 @@
@classmethod
def check_domain(cls, scenarios):
+ pool = Pool()
for scenario in scenarios:
+ Model = pool.get(scenario.model)
try:
value = PYSONDecoder({}).decode(scenario.domain)
fields.domain_validate(value)
+ Model.search(value, limit=0)
except Exception as exception:
raise DomainError(
gettext('marketing_automation.msg_scenario_invalid_domain',
@@ -204,9 +212,15 @@
record = Record.__table__()
cursor = Transaction().connection.cursor()
domain = PYSONDecoder({}).decode(scenario.domain)
+ try:
+ query = Model.search(domain, query=True, order=[])
+ except Exception:
+ logger.error(
+ "Error when triggering scenario %d", scenario.id,
+ exc_info=True)
+ continue
cursor.execute(*(
- Model.search(domain, query=True, order=[])
- - record.select(
+ query - record.select(
Substring(
record.record,
Position(',', record.record) + Literal(1)
