track last process updates run

src/c3nav/control/templates/control/map_updates.html

@@ -24,6 +24,13 @@
                 {% else %}
                     <p>{% trans 'Map updates are currently not processed automatically.' %}</p>
                 {% endif %}
+                {% if last_processed %}
+                    {% trans 'Last run:' %}
+                    {% if not last_processed_success %}
+                        <strong class="red">{% trans '(failed)' %}</strong>
+                    {% endif %}
+                    {{ last_processed|date:"SHORT_DATETIME_FORMAT" }}
+                {% endif %}
                 <button type="submit" name="process_updates" value="1">{% trans 'Process map updates now' %}</button>
             </form>
         </div>

src/c3nav/control/views.py

@@ -1,4 +1,5 @@
 import string
+from datetime import datetime
 from functools import wraps
 from urllib.parse import urlencode
 
@@ -6,6 +7,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
+from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
@@ -14,6 +16,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.crypto import get_random_string
+from django.utils.timezone import make_aware
 from django.utils.translation import ugettext_lazy as _
 
 from c3nav.control.forms import (AccessPermissionForm, AnnouncementForm, MapUpdateFilterForm, MapUpdateForm,
@@ -387,7 +390,13 @@ def map_updates(request):
     paginator = Paginator(queryset, 20)
     users = paginator.page(page)
 
+    last_processed, last_processed_success = cache.get('mapdata:last_process_updates_run', (None, None))
+    if last_processed:
+        make_aware(datetime.fromtimestamp(last_processed))
+
     return render(request, 'control/map_updates.html', {
+        'last_processed': last_processed,
+        'last_processed_success': last_processed_success,
         'auto_process_updates': settings.AUTO_PROCESS_UPDATES,
         'map_update_form': map_update_form,
         'filter_form': filter_form,

src/c3nav/mapdata/tasks.py

@@ -1,6 +1,8 @@
 import logging
+import time
 
 from celery.exceptions import MaxRetriesExceededError
+from django.core.cache import cache
 from django.utils.formats import date_format
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
@@ -26,6 +28,11 @@ def process_map_updates(self):
                 raise
             logger.info('Processing is already running, retrying in 30 seconds.')
             raise self.retry(countdown=30)
+        except Exception:
+            cache.set('mapdata:last_process_updates_run', (int(time.time()), False))
+            raise
+        else:
+            cache.set('mapdata:last_process_updates_run', (int(time.time()), True))
     except MaxRetriesExceededError:
         logger.info('Cannot retry, retries exceeded. Exiting.')
         return