Skip to content

Celery doesn't re-use DB connections with Django (fixes #4116) #4292

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
thedrow merged 1 commit into from
Oct 1, 2017
Merged

Celery doesn't re-use DB connections with Django (fixes #4116) #4292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion celery/fixups/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def close_database(self, **kwargs):
def _close_database(self):
for conn in self._db.connections.all():
try:
conn.close()
conn.close_if_unusable_or_obsolete()
except self.interface_errors:
pass
except self.DatabaseError as exc:
Expand Down
9 changes: 5 additions & 4 deletions t/unit/fixups/test_django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,12 @@ def test__close_database(self):
f._db.connections.all.side_effect = lambda: conns

f._close_database()
conns[0].close.assert_called_with()
conns[1].close.assert_called_with()
conns[2].close.assert_called_with()
conns[0].close_if_unusable_or_obsolete.assert_called_with()
conns[1].close_if_unusable_or_obsolete.assert_called_with()
conns[2].close_if_unusable_or_obsolete.assert_called_with()

conns[1].close.side_effect = KeyError('omg')
conns[1].close_if_unusable_or_obsolete.side_effect = KeyError(
'omg')
with pytest.raises(KeyError):
f._close_database()

Expand Down