Merge branch 'debug-timeout' into pre-master

db_helper.py

@@ -75,7 +75,7 @@ class RedisHelper(object):
         :return: None
         """
         conn = self.connect()
-        conn.set(key_name, value, ex=expire_time)
+        conn.set(key_name, value, ex=int(expire_time))
 
     def add_data_with_zset(self, key_name, data, expire_time=7*24*3600):
         """
@@ -135,7 +135,7 @@ class RedisHelper(object):
         else:
             # key不存在时，需设置过期时间
             conn.zadd(key_name, {value: score})
-            conn.expire(key_name, expire_time)
+            conn.expire(key_name, int(expire_time))
 
     def remove_value_from_zset(self, key_name, value):
         """
@@ -181,7 +181,7 @@ class RedisHelper(object):
         conn = self.connect()
         conn.sadd(key_name, *values)
         # 设置过期时间
-        conn.expire(key_name, expire_time)
+        conn.expire(key_name, int(expire_time))
 
     def data_exists_with_set(self, key_name, value):
         """

utils.py

@@ -13,12 +13,12 @@ config_ = set_config()
 log_ = Log()
 
 
-def request_post(request_url, request_data, timeout=1.0):
+def request_post(request_url, request_data, timeout):
     """
     post 请求 HTTP接口
     :param request_url: 接口URL
     :param request_data: 请求参数
-    :param timeout: 超时时间，默认为1秒，type-float
+    :param timeout: 超时时间，单位为秒，type-float or tuple(connect_timeout, read_timeout)
     :return: res_data json格式
     """
     try:
@@ -46,7 +46,7 @@ def get_videos_remain_view_count(app_type, videos):
         return [], error_flag
 
     request_data = {'appType': app_type, 'videos': videos}
-    result = request_post(request_url=config_.GET_REMAIN_VIEW_COUNT_URL, request_data=request_data, timeout=1)
+    result = request_post(request_url=config_.GET_REMAIN_VIEW_COUNT_URL, request_data=request_data, timeout=(0.1, 1))
 
     if result is None:
         error_flag = True