Merge branch 'db-connection-errors' into 'main'

Db connection errors

See merge request reportcreator/reportcreator!815

api/src/reportcreator_api/api_utils/views.py

@@ -215,7 +215,7 @@ async def get(self, request, *args, **kwargs):
 
         if res.status_code == 200:
             # Run periodic tasks
-            run_in_background(PeriodicTask.objects.run_all_pending_tasks())
+            run_in_background(PeriodicTask.objects.run_all_pending_tasks)()
 
             # Memory cleanup of worker process
             gc.collect()

api/src/reportcreator_api/notifications/tasks.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from datetime import timedelta
 
 import httpx
@@ -7,7 +8,7 @@
 from django.core.serializers.json import DjangoJSONEncoder
 
 from reportcreator_api.notifications.serializers import NotificationSpecSerializer
-from reportcreator_api.tasks.models import periodic_task
+from reportcreator_api.tasks.models import TaskStatus, periodic_task
 from reportcreator_api.utils import license
 
 
@@ -31,8 +32,13 @@ async def fetch_notifications(task_info):
     if not settings.NOTIFICATION_IMPORT_URL:
         return
 
-    data = await fetch_notifications_request()
-    serializer = NotificationSpecSerializer(data=data, many=True)
-    serializer.is_valid(raise_exception=True)
-    await sync_to_async(serializer.save)()
+    try:
+        data = await fetch_notifications_request()
+        serializer = NotificationSpecSerializer(data=data, many=True)
+        serializer.is_valid(raise_exception=True)
+        await sync_to_async(serializer.save)()
+        return TaskStatus.SUCCESS
+    except httpx.TransportError as ex:
+        logging.warning(f'Failed to fetch notifications: {ex}. Check your internet connection.')
+        return TaskStatus.FAILED
 

api/src/reportcreator_api/tasks/models.py

@@ -61,7 +61,7 @@ def unregister(self, task: PeriodicTaskSpec):
 
 def periodic_task(schedule: timedelta, id: str|None = None):
     def inner(func):
-        periodic_task_registry.register( PeriodicTaskSpec(
+        periodic_task_registry.register(PeriodicTaskSpec(
             id=id or f'{func.__module__}.{func.__name__}',
             schedule=schedule,
             func=func,

api/src/reportcreator_api/tasks/querysets.py

@@ -63,16 +63,19 @@ async def run_task(self, task_info):
         try:
             async with elasticapm.async_capture_span(task_info.id):
                 if iscoroutinefunction(task_info.spec.func):
-                    await task_info.spec.func(task_info)
+                    res = await task_info.spec.func(task_info)
                 else:
-                    await sync_to_async(task_info.spec.func)(task_info)
-            task_info.model.status = TaskStatus.SUCCESS
-            task_info.model.last_success = timezone.now()
-            task_info.model.completed = task_info.model.last_success
+                    res = await sync_to_async(task_info.spec.func)(task_info)
+            task_info.model.status = res if isinstance(res, TaskStatus) else TaskStatus.SUCCESS
         except Exception:
             logging.exception(f'Error while running periodic task "{task_info.id}"')
             task_info.model.status = TaskStatus.FAILED
-            task_info.model.completed = timezone.now()
+
+        # Set completed time
+        task_info.model.completed = timezone.now()
+        if task_info.model.status == TaskStatus.SUCCESS:
+            task_info.model.last_success = task_info.model.completed
+
         log.info(f'Completed periodic task "{task_info.id}" with status "{task_info.model.status}"')
 
         await task_info.model.asave()

api/src/reportcreator_api/tasks/rendering/render.py

@@ -38,11 +38,11 @@ async def weasyprint_start_process():
 
 @log_timing(log_start=True)
 async def weasyprint_render_to_pdf(proc, **kwargs) -> RenderStageResult:
-    @sync_to_async
+    @sync_to_async()
     def encode_data():
         return json.dumps(kwargs, cls=DjangoJSONEncoder).encode()
 
-    @sync_to_async
+    @sync_to_async()
     def decode_data(stdout):
         return RenderStageResult.from_dict(json.loads(stdout.decode()))
 

api/src/reportcreator_api/utils/utils.py

@@ -1,9 +1,12 @@
 import asyncio
+import logging
 import uuid
 from datetime import date
 from itertools import groupby
 from typing import Any, Iterable, OrderedDict
 
+from asgiref.sync import sync_to_async
+from django.db import close_old_connections, connections
 from django.utils import dateparse, timezone
 
 
@@ -137,8 +140,22 @@ def groupby_to_dict(data: dict, key) -> dict:
 
 
 _background_tasks = set()
-def run_in_background(coro):
-    task = asyncio.create_task(coro)
-    _background_tasks.add(task)
-    task.add_done_callback(_background_tasks.discard)
-
+def run_in_background(func):
+    def inner(*args, **kwargs):
+        @sync_to_async()
+        def task_finished():
+            if not connections['default'].in_atomic_block:
+                close_old_connections()
+
+        async def wrapper():
+            try:
+                await func(*args, **kwargs)
+            except Exception:
+                logging.exception(f'Error while running run_in_background({func.__name__})')
+            finally:
+                await task_finished()
+
+        task = asyncio.create_task(wrapper())
+        _background_tasks.add(task)
+        task.add_done_callback(_background_tasks.discard)
+    return inner