Browse Source

修改美洲redis为aws节点

locky 1 year ago
parent
commit
ccd84a2490
2 changed files with 14 additions and 14 deletions
  1. 1 2
      AnsjerPush/us_config/formal_config.py
  2. 13 12
      Object/RedisObject.py

+ 1 - 2
AnsjerPush/us_config/formal_config.py

@@ -1,7 +1,6 @@
 """
 独立于config.py的配置文件
 """
-import os
 import datetime
 
 # 配置信息
@@ -21,7 +20,7 @@ SECRET_ACCESS_KEY = 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw'
 PUSH_BUCKET = 'foreignpush'                                # 推送存储桶
 
 # redis节点
-REDIS_ADDRESS = 'amaaaaaayszequiamxr7cdpparig3ptmytvde5vvnz6n7gceo4232sbhhlsa-p.redis.us-phoenix-1.oci.oraclecloud.com'
+REDIS_ADDRESS = 'pushredis.5tgle2.0001.usw1.cache.amazonaws.com'
 
 APNS_MODE = 'prod'
 

+ 13 - 12
Object/RedisObject.py

@@ -1,21 +1,24 @@
-import redis,ssl
+import redis
 from AnsjerPush.config import REDIS_ADDRESS, CONFIG_INFO, CONFIG_US
 
 # 本地调试把注释打开
 # REDIS_ADDRESS = '127.0.0.1'
 
+
 class RedisObject:
 
     def __init__(self, db=0):
-        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,
-            )
+        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,
+        #     )
 
     def set_data(self, key, val, expire=0):
         try:
@@ -88,5 +91,3 @@ class RedisObject:
         @return : bool
         """
         return self.CONN.lindex(name, index)
-
-RedisObject_OCL = RedisObject