External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-05 01:59:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Re-do the way we perform dtend calculation by parsing the until value

Browse Source 
instead of attempting to read the last item from the list in cases where
the list is very long
This commit is contained in:
Matthew Jones
2014-04-02 11:44:07 -04:00
parent 2f2f8aae11
commit 3e2e682658
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/schedules.py
View File

@@ -1,7 +1,9 @@
# Copyright (c) 2014 AnsibleWorks, Inc. # Copyright (c) 2014 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
import re
import logging import logging
import datetime
import dateutil.rrule import dateutil.rrule
# Django # Django
@@ -92,13 +94,15 @@ class Schedule(CommonModel):
self.next_run = next_run_actual self.next_run = next_run_actual
self.dtstart = future_rs[0] self.dtstart = future_rs[0]
if "until" in self.rrule.lower() or 'count' in self.rrule.lower(): self.dtend = None
if 'until' in self.rrule.lower():
match_until = re.match(".*?(UNTIL\=[0-9]+T[0-9]+Z)", self.rrule)
until_date = match_until.groups()[0].split("=")[1]
self.dtend = make_aware(datetime.datetime.strptime(until_date, "%Y%m%dT%H%M%SZ"), get_default_timezone())
if 'count' in self.rrule.lower():
self.dtend = future_rs[-1] self.dtend = future_rs[-1]
else:
self.dtend = None
self.unified_job_template.update_computed_fields() self.unified_job_template.update_computed_fields()
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# TODO: Check if new rrule, if so set dtstart and dtend to null
self.update_computed_fields() self.update_computed_fields()
super(Schedule, self).save(*args, **kwargs) super(Schedule, self).save(*args, **kwargs)