2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

better logging in many places

Browse source
This commit is contained in:
Laura Klünder 2017-11-16 20:54:59 +01:00
parent c754f046ee
commit c890ae6bbf
8 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/c3nav/mapdata/tasks.py
View file

@ -1,3 +1,5 @@
import logging
from django.db import DatabaseError
from django.utils.formats import date_format
from django.utils.translation import ugettext_lazy as _
@ -5,24 +7,32 @@ from django.utils.translation import ungettext_lazy
from c3nav.celery import app
logger = logging.getLogger('c3nav')
@app.task(bind=True, max_retries=10)
def process_map_updates(self):
if self.request.called_directly:
logger.info('Processing map updates by direct command...')
else:
logger.info('Processing map updates...')
from c3nav.mapdata.models import MapUpdate
try:
updates = MapUpdate.process_updates()
except DatabaseError:
if self.request.called_directly:
raise
logger.info('Processing is already running, retrying in 30 seconds.')
raise self.retry(countdown=30)
if updates:
print()
print(ungettext_lazy('%d map update processed.', '%d map updates processed.', len(updates)) % len(updates))
logger.info(ungettext_lazy('%d map update processed.', '%d map updates processed.', len(updates)) % len(updates))
if updates:
print(_('Last processed update: %(date)s (#%(id)d)') % {
logger.info(_('Last processed update: %(date)s (#%(id)d)') % {
'date': date_format(updates[-1].datetime, 'DATETIME_FORMAT'),
'id': updates[-1].pk,
})