Skip to content

Fix DatabaseScheduler behavior when schedule is changed from interval to crontab #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2017
Merged

Fix DatabaseScheduler behavior when schedule is changed from interval to crontab #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb6bc10
add regression test for ModelEntry.from_entry
dmitry-mukhin Nov 9, 2014
8d6dcde
fix ModelEntry.from_entry and ModelEntry.__repr__ behavior
dmitry-mukhin Nov 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion djcelery/schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ def from_entry(cls, name, skip_fields=('relative', 'options'), **entry):
fields.pop(skip_field, None)
schedule = fields.pop('schedule')
model_schedule, model_field = cls.to_model_schedule(schedule)

# reset schedule
for t in cls.model_schedules:
fields[t[2]] = None

fields[model_field] = model_schedule
fields['args'] = dumps(fields.get('args') or [])
fields['kwargs'] = dumps(fields.get('kwargs') or {})
Expand All @@ -131,7 +136,7 @@ def from_entry(cls, name, skip_fields=('relative', 'options'), **entry):
))

def __repr__(self):
return '<ModelEntry: {0} {1}(*{2}, **{3}) {{4}}>'.format(
return '<ModelEntry: {0} {1}(*{2}, **{3}) {4}>'.format(
safe_str(self.name), self.task, safe_repr(self.args),
safe_repr(self.kwargs), self.schedule,
)
Expand Down
17 changes: 15 additions & 2 deletions djcelery/tests/test_schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,21 @@ def test_entry(self):
self.assertGreater(e3.last_run_at, e2.last_run_at)
self.assertEqual(e3.total_run_count, 1)

def test_from_entry(self):
name = 'interval-vs-crontab'
entry = {'task': 'djcelery.unittest.add{0}'.format(_next_id()),
'args': '[2, 2]',
'schedule': timedelta(hours=24),}
self.Entry.from_entry(name, **entry)
schedule1 = PeriodicTask.objects.get(name=name).schedule
self.assertIsInstance(schedule1, schedule)

# update schedule
entry['schedule'] = crontab(minute=0, hour='*/6')
self.Entry.from_entry(name, **entry)
schedule2 = PeriodicTask.objects.get(name=name).schedule
self.assertIsInstance(schedule2, crontab)


class test_DatabaseScheduler(unittest.TestCase):
Scheduler = TrackingScheduler
Expand Down Expand Up @@ -144,8 +159,6 @@ def test_schedule_changed(self):
self.m1.save()
e1 = self.s.schedule[self.m1.name]
self.assertListEqual(e1.args, [32, 32])
e1 = self.s.schedule[self.m1.name]
self.assertListEqual(e1.args, [32, 32])

self.m3.delete()
self.assertRaises(KeyError, self.s.schedule.__getitem__, self.m3.name)
Expand Down