Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dj_cqrs/controller/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ def route_signal_to_replica_model(signal_type, cqrs_id, instance_data, previous_

if model_cls:
if signal_type == SignalType.DELETE:
with transaction.atomic():
with transaction.atomic(savepoint=False):
return model_cls.cqrs_delete(instance_data)

elif signal_type == SignalType.SAVE:
with transaction.atomic():
with transaction.atomic(savepoint=False):
return model_cls.cqrs_save(instance_data, previous_data=previous_data)

elif signal_type == SignalType.SYNC:
with transaction.atomic():
with transaction.atomic(savepoint=False):
return model_cls.cqrs_save(
instance_data,
previous_data=previous_data,
Expand Down
7 changes: 6 additions & 1 deletion dj_cqrs/transport/rabbit_mq.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ def _consume_message(cls, ch, method, properties, body):
)

cls.log_consumed(payload)
instance = consumer.consume(payload)

instance = None
try:
instance = consumer.consume(payload)
except Exception:
logger.error('CQRS service exception', exc_info=True)

if instance:
ch.basic_ack(delivery_tag=method.delivery_tag)
Expand Down