Skip to content

Commit 3af4808

Browse files
authored
Merge pull request jonaswinkler#1387 from paperless-ngx/bugfix-task-error-prevents-consume
Bugfix: Catch all exceptions during the task signals
2 parents 676ba9c + d4c3b76 commit 3af4808

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/documents/signals/handlers.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from django.db import DatabaseError
1212
from django.db import models
1313
from django.db.models import Q
14-
from django.db.utils import OperationalError
1514
from django.dispatch import receiver
1615
from django.utils import termcolors
1716
from django.utils import timezone
@@ -514,7 +513,9 @@ def init_paperless_task(sender, task, **kwargs):
514513
paperless_task.name = task["name"]
515514
paperless_task.created = task["started"]
516515
paperless_task.save()
517-
except OperationalError as e:
516+
except Exception as e:
517+
# Don't let an exception in the signal handlers prevent
518+
# a document from being consumed.
518519
logger.error(f"Creating PaperlessTask failed: {e}")
519520

520521

@@ -527,10 +528,10 @@ def paperless_task_started(sender, task, **kwargs):
527528
)
528529
paperless_task.started = timezone.now()
529530
paperless_task.save()
530-
except OperationalError as e:
531-
logger.error(f"Creating PaperlessTask failed: {e}")
532531
except PaperlessTask.DoesNotExist:
533532
pass
533+
except Exception as e:
534+
logger.error(f"Creating PaperlessTask failed: {e}")
534535

535536

536537
@receiver(models.signals.post_save, sender=django_q.models.Task)
@@ -542,7 +543,7 @@ def update_paperless_task(sender, instance, **kwargs):
542543
)
543544
paperless_task.attempted_task = instance
544545
paperless_task.save()
545-
except OperationalError as e:
546-
logger.error(f"Creating PaperlessTask failed: {e}")
547546
except PaperlessTask.DoesNotExist:
548547
pass
548+
except Exception as e:
549+
logger.error(f"Creating PaperlessTask failed: {e}")

0 commit comments

Comments
 (0)