From 104e45c7494d114ce3dd068e35501ed93d527dd2 Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Mon, 26 Mar 2018 17:07:55 -0400 Subject: Implement Booking Cleanup Task Jira: PHAROS-344 Two new settings in config.env allow setting 1) how "stale" an expired booking can get before being culled and 2) how many expired bookings are kept around before culling If either condition is met, expired bookings will be deleted until both are false. Change-Id: I6b091e93c6fe5d47b75ebf5325b717fa898c773c Signed-off-by: Sawyer Bergeron --- dashboard/src/pharos_dashboard/settings.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dashboard/src/pharos_dashboard') diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py index 0ac5479..07e3920 100644 --- a/dashboard/src/pharos_dashboard/settings.py +++ b/dashboard/src/pharos_dashboard/settings.py @@ -170,6 +170,9 @@ RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD'] BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//' +BOOKING_EXP_TIME = os,environ['BOOKING_EXPIRE_TIME'] +BOOKING_MAX_NUM = os.environ['BOOKING_MAXIMUM_NUMBER'] + CELERYBEAT_SCHEDULE = { 'sync-jenkins': { 'task': 'jenkins.tasks.sync_jenkins', @@ -183,6 +186,10 @@ CELERYBEAT_SCHEDULE = { 'task': 'dashboard.tasks.database_cleanup', 'schedule': timedelta(hours=24) }, + 'booking_cleanup': { + 'task': 'dashboard.tasks.booking_cleanup', + 'schedule': timedelta(hours=24) + }, } # Jenkins Settings ALL_SLAVES_URL = os.environ['JENKINS_URL'] + '/computer/api/json?tree=computer[displayName,offline,idle]' -- cgit 1.2.3-korg