From 105558595bc3c750fdba8e0bddd2d293c101e4dc Mon Sep 17 00:00:00 2001 From: Randall Leeds Date: Thu, 15 Sep 2011 17:49:19 -0700 Subject: [PATCH] fix #247 - gunicorn doesn't work with Tornado 2.0 --- gunicorn/workers/gtornado.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gunicorn/workers/gtornado.py b/gunicorn/workers/gtornado.py index c6b5d98c..81316ff6 100644 --- a/gunicorn/workers/gtornado.py +++ b/gunicorn/workers/gtornado.py @@ -52,7 +52,12 @@ class TornadoWorker(Worker): self.app = WSGIContainer(self.wsgi) server = HTTPServer(self.wsgi, io_loop=self.ioloop) - server._socket = self.socket + if hasattr(server, "add_socket"): # tornado > 2.0 + server.add_socket(self.socket) + elif hasattr(server, "_sockets"): # tornado 2.0 + server._sockets[self.socket.fileno()] = self.socket + else: # tornado 1.2 or earlier + server._socket = self.socket server.start(num_processes=1) self.ioloop.start()