|
@@ -1,5 +1,6 @@
|
|
|
import redis
|
|
|
-from AnsjerPush.config import REDIS_ADDRESS, CONFIG_INFO, CONFIG_US
|
|
|
+from redis.connection import SSLConnection
|
|
|
+from AnsjerPush.config import REDIS_ADDRESS, CONFIG_INFO, CONFIG_EUR
|
|
|
|
|
|
# 本地调试把注释打开
|
|
|
# REDIS_ADDRESS = '127.0.0.1'
|
|
@@ -8,17 +9,17 @@ from AnsjerPush.config import REDIS_ADDRESS, CONFIG_INFO, CONFIG_US
|
|
|
class RedisObject:
|
|
|
|
|
|
def __init__(self, db=0):
|
|
|
- self.POOL = redis.ConnectionPool(host=REDIS_ADDRESS, port=6379, db=db)
|
|
|
- self.CONN = redis.Redis(connection_pool=self.POOL)
|
|
|
- # if CONFIG_INFO != CONFIG_US:
|
|
|
- # self.POOL = redis.ConnectionPool(host=REDIS_ADDRESS, port=6379, db=db)
|
|
|
- # self.CONN = redis.Redis(connection_pool=self.POOL)
|
|
|
- # else:
|
|
|
- # self.CONN = redis.StrictRedis(
|
|
|
- # host=REDIS_ADDRESS,
|
|
|
- # ssl=True,
|
|
|
- # ssl_cert_reqs=None,
|
|
|
- # )
|
|
|
+ if CONFIG_INFO != CONFIG_EUR:
|
|
|
+ pool = redis.ConnectionPool(host=REDIS_ADDRESS, port=6379, db=db)
|
|
|
+ self.CONN = redis.Redis(connection_pool=pool)
|
|
|
+ else:
|
|
|
+ pool = redis.ConnectionPool(connection_class=SSLConnection, host=REDIS_ADDRESS, port=6379, db=db)
|
|
|
+ self.CONN = redis.StrictRedis(
|
|
|
+ connection_pool=pool,
|
|
|
+ host=REDIS_ADDRESS,
|
|
|
+ ssl=True,
|
|
|
+ ssl_cert_reqs=None,
|
|
|
+ )
|
|
|
|
|
|
def set_data(self, key, val, expire=0):
|
|
|
try:
|