From: Stiletto <blasux@blasux.ru>
Date: Mon, 6 Aug 2012 15:43:27 +0000 (+0400)
Subject: Fire shutdown event from main loop
X-Git-Tag: v2.4.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f594c7b20586f8015c33969720ceac95dbab2ce9;p=thirdparty%2Ftornado.git

Fire shutdown event from main loop
---

diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py
index 07ca8c58e..935b6233e 100644
--- 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 327af2db7..152d22785 100644
--- 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()