From 6190b6cd1f9317572a941e0d061d7ac8719e2d33 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Tue, 19 Jun 2018 11:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9D=87=E4=BB=B7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=88=B0redis=E9=9B=86=E7=BE=A4=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdReceiver.py | 18 +++++++++--------- PriceSystem/CalcCmdSender.py | 6 +----- PriceSystem/CalcSpeedMonitor.py | 7 ++----- PriceSystem/RentCalcCmdReceiver.py | 4 +--- PriceSystem/RentCalcCmdSender.py | 6 +----- PriceSystem/RentCalcSpeedMonitor.py | 4 +--- PriceSystem/fangjia/__init__.py | 15 +++++++++++++++ PriceSystem/ones_Sender.py | 4 +--- 8 files changed, 31 insertions(+), 33 deletions(-) diff --git a/PriceSystem/CalcCmdReceiver.py b/PriceSystem/CalcCmdReceiver.py index 0e068a7..6034409 100644 --- a/PriceSystem/CalcCmdReceiver.py +++ b/PriceSystem/CalcCmdReceiver.py @@ -1,21 +1,21 @@ +import datetime import json import multiprocessing -import time -import redis -import config -import sell_price -import fangjia -import datetime -import pytz import os +import time + +import pytz + +import config +import fangjia +import sell_price QUEUE = "calc_cmd" -redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) logger = fangjia.get_logger("CalcCmdReceiver") def worker(): - client = redis.Redis(connection_pool=redis_pool) + client = fangjia.get_default_redis_connection() while True: try: cmd = client.lpop(QUEUE) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 9bb2632..bfa1f00 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -3,9 +3,6 @@ import json import sys import time from datetime import date - -import redis - import config import fangjia @@ -21,8 +18,7 @@ class CJsonEncoder(json.JSONEncoder): QUEUE = "calc_cmd" -redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) -client = redis.Redis(connection_pool=redisPool) +client = fangjia.get_default_redis_connection() logger = fangjia.get_logger("CalcCmdSender") diff --git a/PriceSystem/CalcSpeedMonitor.py b/PriceSystem/CalcSpeedMonitor.py index 5049b3b..ee835e3 100644 --- a/PriceSystem/CalcSpeedMonitor.py +++ b/PriceSystem/CalcSpeedMonitor.py @@ -1,18 +1,15 @@ import json import multiprocessing import time -import redis -import config + import fangjia QUEUE = "calc_cmd" -redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) - logger = fangjia.get_logger("CalcSpeedMonitor") def monitor(pname): - client = redis.Redis(connection_pool=redis_pool) + client = fangjia.get_default_redis_connection() while True: pre_counter = client.llen(QUEUE) time.sleep(60) diff --git a/PriceSystem/RentCalcCmdReceiver.py b/PriceSystem/RentCalcCmdReceiver.py index f6582ed..3af023f 100644 --- a/PriceSystem/RentCalcCmdReceiver.py +++ b/PriceSystem/RentCalcCmdReceiver.py @@ -2,18 +2,16 @@ import json import multiprocessing import os import time -import redis import config import fangjia import rent_price.district_map0413 as rentPrice QUEUE = config.get_rent_calc_cmd_queue_name() -redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_rent_redis_db()) logger = fangjia.get_logger("RentCalcCmdReceiver") def worker(): - client = redis.Redis(connection_pool=redis_pool) + client = fangjia.get_default_redis_connection() while True: try: cmd = client.lpop(QUEUE) diff --git a/PriceSystem/RentCalcCmdSender.py b/PriceSystem/RentCalcCmdSender.py index a5ebd4e..cafb48a 100644 --- a/PriceSystem/RentCalcCmdSender.py +++ b/PriceSystem/RentCalcCmdSender.py @@ -4,9 +4,6 @@ import json import sys import time from datetime import date - -import redis - import config import fangjia @@ -51,8 +48,7 @@ class CJsonEncoder(json.JSONEncoder): QUEUE = config.get_rent_calc_cmd_queue_name() -redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_rent_redis_db()) -client = redis.Redis(connection_pool=redisPool) +client = fangjia.get_default_redis_connection() logger = fangjia.get_logger("RentCalcCmdSender") diff --git a/PriceSystem/RentCalcSpeedMonitor.py b/PriceSystem/RentCalcSpeedMonitor.py index bc76baf..7fe4523 100644 --- a/PriceSystem/RentCalcSpeedMonitor.py +++ b/PriceSystem/RentCalcSpeedMonitor.py @@ -1,18 +1,16 @@ import json import multiprocessing import time -import redis import config import fangjia QUEUE = config.get_rent_calc_cmd_queue_name() -redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_rent_redis_db()) logger = fangjia.get_logger("RentCalcSpeedMonitor") def monitor(pname): - client = redis.Redis(connection_pool=redis_pool) + client = fangjia.get_default_redis_connection() while True: pre_counter = client.llen(QUEUE) time.sleep(60) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 7406272..22a9d32 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -9,6 +9,7 @@ import requests import json import pickle import redis +from rediscluster import StrictRedisCluster from fangjia import mongoClients as mongoClients from fangjia import ElasticsearchClient as es from fangjia.cachedObjectWrapper import CachedObjectWrapper @@ -526,6 +527,20 @@ def rent_find_disanganf_price(query, fields=None): raise Exception("yang ben cha xun shi bai1") +def get_default_redis_connection(): + redis_nodes = [ + {'host': '192.168.0.79', 'port': 6379}, + {'host': '192.168.0.79', 'port': 6380}, + {'host': '192.168.0.79', 'port': 6381}, + {'host': '192.168.0.81', 'port': 6382}, + {'host': '192.168.0.81', 'port': 6383}, + {'host': '192.168.0.81', 'port': 6384} + ] + redis_connection = StrictRedisCluster(startup_nodes=redis_nodes) + return redis_connection + + + diff --git a/PriceSystem/ones_Sender.py b/PriceSystem/ones_Sender.py index 22d3afc..a161f00 100644 --- a/PriceSystem/ones_Sender.py +++ b/PriceSystem/ones_Sender.py @@ -20,9 +20,7 @@ class CJsonEncoder(json.JSONEncoder): QUEUE = "calc_cmd" -#redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) -redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=2) -client = redis.Redis(connection_pool=redisPool) +client = fangjia.get_default_redis_connection() logger = fangjia.get_logger("CalcCmdSender")