diff --git a/config/default.py b/config/default.py index ebc6d5c..70c924e 100644 --- a/config/default.py +++ b/config/default.py @@ -11,20 +11,28 @@ CELERYBEAT_SCHEDULE = { 'task': 'ogn.collect.database.import_ddb', 'schedule': timedelta(minutes=15), }, + 'update-device-table': { + 'task': 'ogn.collect.database.update_devices', + 'schedule': timedelta(minutes=5), + }, + 'update-receiver-table': { + 'task': 'ogn.collect.database.update_receivers', + 'schedule': timedelta(minutes=5), + }, + 'update-country-codes': { + 'task': 'ogn.collect.database.update_country_code', + 'schedule': timedelta(minutes=5), + }, 'update-takeoff-and-landing': { - 'task': 'ogn.collect.logbook.compute_takeoff_and_landing', + 'task': 'ogn.collect.takeoff_landing.update_takeoff_landing', 'schedule': timedelta(minutes=15), }, 'update-logbook': { - 'task': 'ogn.collect.logbook.compute_logbook', - 'schedule': timedelta(minutes=1), + 'task': 'ogn.collect.logbook.update_logbook', + 'schedule': timedelta(minutes=15), }, - 'update-altitudes': { - 'task': 'ogn.collect.logbook.compute_altitudes', - 'schedule': timedelta(minutes=1), - }, - 'update-receiver-table': { - 'task': 'ogn.collect.receiver.update_receivers', + 'update-max-altitudes': { + 'task': 'ogn.collect.logbook.update_max_altitude', 'schedule': timedelta(minutes=15), }, } diff --git a/ogn/collect/database.py b/ogn/collect/database.py index 812971b..d954386 100644 --- a/ogn/collect/database.py +++ b/ogn/collect/database.py @@ -38,6 +38,8 @@ def import_ddb(session=None): counter = update_device_infos(session, address_origin) logger.info("Imported {} devices.".format(counter)) + return "Imported {} devices.".format(counter) + @app.task def import_file(session=None, path='tests/custom_ddb.txt'): @@ -52,6 +54,8 @@ def import_file(session=None, path='tests/custom_ddb.txt'): counter = update_device_infos(session, address_origin, csvfile=path) logger.info("Imported {} devices.".format(counter)) + return "Imported {} devices.".format(counter) + @app.task def update_devices(session=None):