Fix an issue with default schedules

These weren't being created correctly, the logic meant an extra schedule
would be created on cleanup facts erroneously selected to be cleanup
activity stream
This commit is contained in:
Matthew Jones
2015-09-25 14:17:31 -04:00
parent 3a6807c5b4
commit a7f1e69352

View File

@@ -16,16 +16,17 @@ class Migration(DataMigration):
if stj.name == "Cleanup Job Details": if stj.name == "Cleanup Job Details":
sched = orm.Schedule(name="Cleanup Job Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU" % nowtime, sched = orm.Schedule(name="Cleanup Job Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU" % nowtime,
description="Automatically Generated Schedule", enabled=True, extra_data={"days": "120"}) description="Automatically Generated Schedule", enabled=True, extra_data={"days": "120"})
if stj.name == "Cleanup Deleted Data": elif stj.name == "Cleanup Deleted Data":
sched = orm.Schedule(name="Cleanup Deleted Data Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO" % nowtime, sched = orm.Schedule(name="Cleanup Deleted Data Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO" % nowtime,
description="Automatically Generated Schedule", enabled=True, extra_data={"days": "30"}) description="Automatically Generated Schedule", enabled=True, extra_data={"days": "30"})
if stj.name == "Cleanup Activity Stream": elif stj.name == "Cleanup Activity Stream":
sched = orm.Schedule(name="Cleanup Activity Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU" % nowtime, sched = orm.Schedule(name="Cleanup Activity Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU" % nowtime,
description="Automatically Generated Schedule", enabled=True, extra_data={"days": "355"}) description="Automatically Generated Schedule", enabled=True, extra_data={"days": "355"})
if feature_enabled('system_tracking'): elif stj.name == "Cleanup Fact Details" and feature_enabled('system_tracking'):
if stj.name == "Cleanup Fact Details": sched = orm.Schedule(name="Cleanup Fact Schedule", rrule="DTSTART:%s RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=1" % nowtime,
sched = orm.Schedule(name="Cleanup Fact Schedule", rrule="DTSTART:%s RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=1" % nowtime, description="Automatically Generated Schedule", enabled=True, extra_data={'older_than': '120d', 'granularity': '1w'})
description="Automatically Generated Schedule", enabled=True, extra_data={'older_than': '120d', 'granularity': '1w'}) else:
continue
sched.unified_job_template = stj sched.unified_job_template = stj
sched.created = nowtime_actual sched.created = nowtime_actual
sched.modified = nowtime_actual sched.modified = nowtime_actual