aboutsummaryrefslogtreecommitdiffstats
path: root/python-tornado/unassembled
diff options
context:
space:
mode:
Diffstat (limited to 'python-tornado/unassembled')
-rw-r--r--python-tornado/unassembled/Platform.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/python-tornado/unassembled/Platform.py b/python-tornado/unassembled/Platform.py
index 618927e..4df04b3 100644
--- a/python-tornado/unassembled/Platform.py
+++ b/python-tornado/unassembled/Platform.py
@@ -9,6 +9,7 @@ except ImportError:
import hmac
import tornado.ioloop
+from tornado.stack_context import ExceptionStackContext
from PubnubCrypto import PubnubCrypto
ioloop = tornado.ioloop.IOLoop.instance()
@@ -47,9 +48,17 @@ class Pubnub(PubnubCoreAsync):
url = self.getUrl(request)
## Send Request Expecting JSON Response
#print self.headers
- request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=310, request_timeout=310 )
+
+ request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 )
+
def responseCallback(response):
- callback(eval(response._get_body()))
+ def handle_exc(*args):
+ return True
+ if response.error is not None:
+ with ExceptionStackContext(handle_exc):
+ response.rethrow()
+ else:
+ callback(eval(response._get_body()))
self.http.fetch(
request,