Fixed TornadoChannel

 * It was broken by the addition of timeouts,
 * Fixes #25,
 * I've also improved the example.

Author: danielwaterworth

examples/tornado_channel.py

@@ -8,8 +8,9 @@
 #
 #  * Visit http://localhost:8888 in your browser.
 
+import os
 import sys
-sys.path.append("../")
+sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
 import pusher
 
@@ -25,10 +26,11 @@
 class MainHandler(tornado.web.RequestHandler):
     def get(self):
         def callback(response):
-            print "Callback run."
+            print "Callback run. Response: %s" % repr(response)
 
         p = pusher.Pusher()
-        p['a_channel'].trigger('an_event', {'some': 'data'}, callback=callback)
+        # You can receive this event on the app keys page.
+        p['test_channel'].trigger('my_event', {'message': 'Hello from tornado'}, callback=callback)
 
         self.write("Hello, world")
 
@@ -38,4 +40,5 @@ def callback(response):
 
 if __name__ == "__main__":
     application.listen(8888)
+    print "Started, visit http://localhost:8888 in your browser to trigger an event"
     tornado.ioloop.IOLoop.instance().start()

pusher/__init__.py

@@ -174,14 +174,15 @@ def send_request_async(self, query_string, data_string):
     pass
 
 class TornadoChannel(Channel):
-    def trigger(self, event, data={}, socket_id=None, callback=None):
+    def trigger(self, event, data={}, socket_id=None, callback=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
         self.callback = callback
-        return super(TornadoChannel, self).trigger(event, data, socket_id)
+        return super(TornadoChannel, self).trigger(event, data, socket_id, timeout=timeout)
 
-    def send_request(self, signed_path, data_string):
+    def send_request(self, signed_path, data_string, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
+        timeout = None if timeout == socket._GLOBAL_DEFAULT_TIMEOUT else timeout
         import tornado.httpclient
         absolute_url = self.get_absolute_path(signed_path)
-        request = tornado.httpclient.HTTPRequest(absolute_url, method='POST', body=data_string)
+        request = tornado.httpclient.HTTPRequest(absolute_url, method='POST', body=data_string, request_timeout=timeout)
         client = tornado.httpclient.AsyncHTTPClient()
         client.fetch(request, callback=self.callback)
         # Returning 202 to avoid Channel errors. Actual error handling takes place in callback.