Skip to content

Commit

Permalink
workaround for celery/kombu#838 (#521)
Browse files Browse the repository at this point in the history
* workaround for celery/kombu#838;
if we don't explcitly set the timeout we may inherit the temporary default.

* Revert "close connections when deleting vhost during tests"

This reverts commit ecf6c58.

* Revert "Revert "close connections when deleting vhost during tests""

This reverts commit 3d03e6c.
  • Loading branch information
mattbennett committed Mar 15, 2018
1 parent abe2108 commit 88ef076
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions nameko/cli/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ def _bad_call():
'This would kill your service, not close the backdoor. To exit, '
'use ctrl-c.')
socket = eventlet.listen(('localhost', port))
# work around https://github.com/celery/kombu/issues/838
socket.settimeout(None)
gt = eventlet.spawn(
backdoor.backdoor_server,
socket,
Expand Down
2 changes: 2 additions & 0 deletions nameko/web/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ def start(self):
if not self._starting:
self._starting = True
self._sock = eventlet.listen(self.bind_addr)
# work around https://github.com/celery/kombu/issues/838
self._sock.settimeout(None)
self._serv = self.get_wsgi_server(self._sock, self.get_wsgi_app())
self._gt = self.container.spawn_managed_thread(self.run)

Expand Down

0 comments on commit 88ef076

Please sign in to comment.