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