We need JSONable function arguments

ogn_python/collect/celery.py

@@ -18,11 +18,12 @@ logger = get_task_logger(__name__)
 
 
 @celery.task(name='update_takeoff_landings')
-def update_takeoff_landings(delta):
+def update_takeoff_landings(last_minutes):
     """Compute takeoffs and landings."""
 
-    now = datetime.datetime.utcnow()
-    takeoff_update_entries(session=db.session, start=now-delta, end=now, logger=logger)
+    end = datetime.datetime.utcnow()
+    start = end - datetime.timedelta(minutes=last_minutes)
+    takeoff_update_entries(session=db.session, start=start, end=end, logger=logger)
 
 
 @celery.task(name='update_logbook_entries')
@@ -55,15 +56,15 @@ def update_receivers_country_code():
 
 
 @celery.task(name='purge_old_data')
-def purge_old_data(age):
+def purge_old_data(max_hours):
     """Delete AircraftBeacons and ReceiverBeacons older than given 'age'."""
 
     from ogn_python.model import AircraftBeacon, ReceiverBeacon
-    now = datetime.datetime.utcnow()
+    min_timestamp = datetime.datetime.utcnow() - datetime.timedelta(hours=max_hours)
     db.session(AircraftBeacon) \
-        .filter(AircraftBeacon.timestamp < now - age) \
+        .filter(AircraftBeacon.timestamp < min_timestamp) \
         .delete()
 
     db.session(ReceiverBeacon) \
-        .filter(ReceiverBeacon.timestamp < now - age) \
+        .filter(ReceiverBeacon.timestamp < min_timestamp) \
         .delete()

ogn_python/config/default.py

@@ -20,7 +20,7 @@ CELERYBEAT_SCHEDULE = {
     'update-takeoff-and-landing': {
         'task': 'update_takeoff_landings',
         'schedule': timedelta(minutes=1),
-        'kwargs': {'delta': timedelta(minutes=10)}
+        'kwargs': {'last_minutes': 10},
     },
     'update-logbook': {
         'task': 'update_logbook_entries',
@@ -33,6 +33,6 @@ CELERYBEAT_SCHEDULE = {
     #'purge_old_data': {
     #    'task': 'purge_old_data',
     #    'schedule': timedelta(minutes=10),
-    #    'kwargs': {'age': timedelta(days=2)}
+    #    'kwargs': {'max_hours': 48}
     #},
 }