Fire shutdown event from main loop

diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py
index 07ca8c58e54379f05f57cc423d3a2ab43579318f..935b6233ee61782351a3da16a9a2133c5daf8294 100644 (file)
--- a/tornado/platform/twisted.py
+++ b/tornado/platform/twisted.py
@@ -281,7 +281,8 @@ class TornadoReactor(PosixReactorBase):
     # IOLoop.start() instead of Reactor.run().
     def stop(self):
         PosixReactorBase.stop(self)
-        self.fireSystemEvent("shutdown")
+        fire_shutdown = functools.partial(self.fireSystemEvent,"shutdown")
+        self._io_loop.add_callback(fire_shutdown)
 
     def crash(self):
         PosixReactorBase.crash(self)

diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index 327af2db7e0c0a2978e0a632d92630ae51a4e26a..152d227857b8db07acd4cb3ebeaf2891a31900fa 100644 (file)
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -196,6 +196,9 @@ class Reader(object):
     def fileno(self):
         return self._fd.fileno()
 
+    def readConnectionLost(self, reason):
+        self.close()
+
     def connectionLost(self, reason):
         self.close()