commit e6e19a868fbbf623d937d64cfb29f2667080021a
author Cheng Tang <cheng.tang@supwisdom.com> 周四 5月 09 11:45:37 2013 +0800
committer Cheng Tang <cheng.tang@supwisdom.com> 周四 5月 09 11:45:37 2013 +0800
tree 63f0e9d7ebab067c98279fadb99644992bf864e1
parent acccf3e5efc39e82aa93108795ae912de2f32fe9

增加通过Webservice请求后台时自定义超时时间参数

supwisdom/protocol/webservice.py

diff --git a/supwisdom/protocol/webservice.py b/supwisdom/protocol/webservice.py
index 657fc68..2a1b7a1 100644
--- a/supwisdom/protocol/webservice.py
+++ b/supwisdom/protocol/webservice.py
@@ -176,7 +176,7 @@
             http_request = HTTPRequest(url=self.service_url, method='POST',

                 headers={'Content-Type': 'application/json'},

                 connect_timeout=timeout,

-                body=self._pack_body(request))

+                body=self._pack_body(request, timeout))

             http_resp = client.fetch(http_request)

         except HTTPError, ex:

             http_resp = ex.response

@@ -197,11 +197,12 @@
             except:

                 return False

 

-    def _pack_body(self, request):

+    def _pack_body(self, request, timeout):

         funcdata = request.serialize()

         request_token = self.session.gen_request_token()

         if isinstance(funcdata, unicode):

             request_token['funcdata'] = funcdata

         elif isinstance(funcdata, str):

             request_token['funcdata'] = funcdata.decode('gbk', 'ignore')

+        request_token['timeout'] = timeout

         return json.dumps(request_token, ensure_ascii=False)