增加代码
This commit is contained in:
罗干
2018-06-19 11:22:44 +08:00
8 changed files with 31 additions and 33 deletions
+9 -9
View File
@@ -1,21 +1,21 @@
import datetime
import json import json
import multiprocessing import multiprocessing
import time
import redis
import config
import sell_price
import fangjia
import datetime
import pytz
import os import os
import time
import pytz
import config
import fangjia
import sell_price
QUEUE = "calc_cmd" QUEUE = "calc_cmd"
redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
logger = fangjia.get_logger("CalcCmdReceiver") logger = fangjia.get_logger("CalcCmdReceiver")
def worker(): def worker():
client = redis.Redis(connection_pool=redis_pool) client = fangjia.get_default_redis_connection()
while True: while True:
try: try:
cmd = client.lpop(QUEUE) cmd = client.lpop(QUEUE)
+1 -5
View File
@@ -3,9 +3,6 @@ import json
import sys import sys
import time import time
from datetime import date from datetime import date
import redis
import config import config
import fangjia import fangjia
@@ -21,8 +18,7 @@ class CJsonEncoder(json.JSONEncoder):
QUEUE = "calc_cmd" QUEUE = "calc_cmd"
redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) client = fangjia.get_default_redis_connection()
client = redis.Redis(connection_pool=redisPool)
logger = fangjia.get_logger("CalcCmdSender") logger = fangjia.get_logger("CalcCmdSender")
+2 -5
View File
@@ -1,18 +1,15 @@
import json import json
import multiprocessing import multiprocessing
import time import time
import redis
import config
import fangjia import fangjia
QUEUE = "calc_cmd" QUEUE = "calc_cmd"
redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
logger = fangjia.get_logger("CalcSpeedMonitor") logger = fangjia.get_logger("CalcSpeedMonitor")
def monitor(pname): def monitor(pname):
client = redis.Redis(connection_pool=redis_pool) client = fangjia.get_default_redis_connection()
while True: while True:
pre_counter = client.llen(QUEUE) pre_counter = client.llen(QUEUE)
time.sleep(60) time.sleep(60)
+1 -3
View File
@@ -2,18 +2,16 @@ import json
import multiprocessing import multiprocessing
import os import os
import time import time
import redis
import config import config
import fangjia import fangjia
import rent_price.district_map0413 as rentPrice import rent_price.district_map0413 as rentPrice
QUEUE = config.get_rent_calc_cmd_queue_name() 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") logger = fangjia.get_logger("RentCalcCmdReceiver")
def worker(): def worker():
client = redis.Redis(connection_pool=redis_pool) client = fangjia.get_default_redis_connection()
while True: while True:
try: try:
cmd = client.lpop(QUEUE) cmd = client.lpop(QUEUE)
+1 -5
View File
@@ -4,9 +4,6 @@ import json
import sys import sys
import time import time
from datetime import date from datetime import date
import redis
import config import config
import fangjia import fangjia
@@ -51,8 +48,7 @@ class CJsonEncoder(json.JSONEncoder):
QUEUE = config.get_rent_calc_cmd_queue_name() 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 = fangjia.get_default_redis_connection()
client = redis.Redis(connection_pool=redisPool)
logger = fangjia.get_logger("RentCalcCmdSender") logger = fangjia.get_logger("RentCalcCmdSender")
+1 -3
View File
@@ -1,18 +1,16 @@
import json import json
import multiprocessing import multiprocessing
import time import time
import redis
import config import config
import fangjia import fangjia
QUEUE = config.get_rent_calc_cmd_queue_name() 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") logger = fangjia.get_logger("RentCalcSpeedMonitor")
def monitor(pname): def monitor(pname):
client = redis.Redis(connection_pool=redis_pool) client = fangjia.get_default_redis_connection()
while True: while True:
pre_counter = client.llen(QUEUE) pre_counter = client.llen(QUEUE)
time.sleep(60) time.sleep(60)
+15
View File
@@ -9,6 +9,7 @@ import requests
import json import json
import pickle import pickle
import redis import redis
from rediscluster import StrictRedisCluster
from fangjia import mongoClients as mongoClients from fangjia import mongoClients as mongoClients
from fangjia import ElasticsearchClient as es from fangjia import ElasticsearchClient as es
from fangjia.cachedObjectWrapper import CachedObjectWrapper 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") 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
+1 -3
View File
@@ -20,9 +20,7 @@ class CJsonEncoder(json.JSONEncoder):
QUEUE = "calc_cmd" QUEUE = "calc_cmd"
#redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db()) client = fangjia.get_default_redis_connection()
redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=2)
client = redis.Redis(connection_pool=redisPool)
logger = fangjia.get_logger("CalcCmdSender") logger = fangjia.get_logger("CalcCmdSender")