don't pass ssl_options if there are any.

some versions of tornado fail when passing empty ssl options. This
change fix it.

fix #465
This commit is contained in:
benoitc 2013-01-06 08:12:40 +01:00
parent 030468d2cd
commit 84d9f4c604

View File

@ -75,8 +75,13 @@ class TornadoWorker(Worker):
httpserver.HTTPConnection.finish = finish
sys.modules["tornado.httpserver"] = httpserver
server = tornado.httpserver.HTTPServer(app, io_loop=self.ioloop,
ssl_options=self.cfg.ssl_options)
if self.cfg.is_ssl:
server = tornado.httpserver.HTTPServer(app, io_loop=self.ioloop,
ssl_options=self.cfg.ssl_options)
else:
server = tornado.httpserver.HTTPServer(app,
io_loop=self.ioloop)
for s in self.sockets:
s.setblocking(0)
if hasattr(server, "add_socket"): # tornado > 2.0