修改参数名称

crawlaio · Jun 18, 2020 · 388cdd0 · 388cdd0
1 parent 19c9325
commit 388cdd0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ REDIS_SENTINEL_PARAMS= {
 # ----------------------------------------Redis 集群模式-------------------------------------
 
 # Redis 集群地址
-REDIS_MASTER_NODES = [
+REDIS_STARTUP_NODES = [
     {"host": "172.25.2.25", "port": "6379"},
     {"host": "172.25.2.26", "port": "6379"},
     {"host": "172.25.2.27", "port": "6379"},

diff --git a/README.rst b/README.rst
@@ -66,7 +66,7 @@ scrapy-redis 集群版
     # ----------------------------------------Redis 集群模式-------------------------------------
 
     # Redis 集群地址
-    REDIS_MASTER_NODES = [
+    REDIS_STARTUP_NODES = [
         {"host": "172.25.2.25", "port": "6379"},
         {"host": "172.25.2.26", "port": "6379"},
         {"host": "172.25.2.27", "port": "6379"},

diff --git a/scrapy_redis_sentinel/connection.py b/scrapy_redis_sentinel/connection.py
@@ -106,7 +106,7 @@ def get_redis_cluster_from_settings(settings):
     """
     params = defaults.REDIS_PARAMS.copy()
     params.update(settings.getdict("REDIS_CLUSTER_PARAMS"))
-    params.setdefault("startup_nodes", settings.get("REDIS_MASTER_NODES"))
+    params.setdefault("startup_nodes", settings.get("REDIS_STARTUP_NODES"))
     # XXX: Deprecate REDIS_* settings.
     for source, dest in REDIS_CLUSTER_SETTINGS_PARAMS_MAP.items():
         val = settings.get(source)
@@ -172,6 +172,6 @@ def from_settings(settings):
     """
     if "REDIS_SENTINELS" in settings:
         return get_redis_sentinel_from_settings(settings)
-    elif "REDIS_MASTER_NODES" in settings or "REDIS_CLUSTER_URL" in settings:
+    elif "REDIS_STARTUP_NODES" in settings or "REDIS_CLUSTER_URL" in settings:
         return get_redis_cluster_from_settings(settings)
     return get_redis_from_settings(settings)
diff --git a/scrapy_redis_sentinel/scheduler.py b/scrapy_redis_sentinel/scheduler.py
@@ -111,7 +111,7 @@ def from_settings(cls, settings):
             kwargs["serializer"] = importlib.import_module(kwargs["serializer"])
 
         server = connection.from_settings(settings)
-        if not settings.get("REDIS_MASTER_NODES", False):
+        if not settings.get("REDIS_STARTUP_NODES", False):
             server.ping()
 
         return cls(server=server, **kwargs)

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
     name='scrapy-redis-sentinel',
     description="Redis Cluster for Scrapy.",
     long_description=open('README.rst', encoding="utf-8").read(),
-    version="0.2.2",
+    version="0.2.3",
     author="Shi Tao",
     author_email='shitao0418@gmail.com',
     url='https://github.com/crawlmap/scrapy-redis-sentinel.git',