Merge branch 'debug' into pre-master

db_helper.py

@@ -235,7 +235,7 @@ class RedisHelper(object):
 #conn = psycopg2.connect(**hologres_info)
 #cur = conn.cursor()
 
-connectPool = pgpool.SimpleConnectionPool(1, 10, **config_.HOLOGRES_INFO)
+connectPool = pgpool.SimpleConnectionPool(1, 30, **config_.HOLOGRES_INFO)
 
 
 class HologresHelper(object):
@@ -245,12 +245,12 @@ class HologresHelper(object):
 
     def get_data(self, sql):
         #global conn
+        # 连接Hologres
+        #conn = psycopg2.connect(**self.hologres_info)
+        conn = connectPool.getconn()
+        # 创建游标
+        cur = conn.cursor()
         try:
-            # 连接Hologres
-            #conn = psycopg2.connect(**self.hologres_info)
-            conn = connectPool.getconn()
-            # 创建游标
-            cur = conn.cursor()
             # 查询数据
             cur.execute(sql)
             data = cur.fetchall()
@@ -264,6 +264,8 @@ class HologresHelper(object):
         except Exception as e:
             log_.error('hologress error...')
             log_.error(traceback.format_exc())
+            cur.close()
+            connectPool.putconn(conn, close=False)
             return []
         return data