Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
This commit is contained in:
@@ -22,7 +22,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())
|
redisPool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
|
||||||
client = redis.Redis(connection_pool=redisPool)
|
client = redis.Redis(connection_pool=redisPool)
|
||||||
logger = fangjia.get_logger("CalcCmdReceiver")
|
logger = fangjia.get_logger("CalcCmdSender")
|
||||||
|
|
||||||
|
|
||||||
def get_district(city):
|
def get_district(city):
|
||||||
|
|||||||
@@ -3,10 +3,13 @@ import multiprocessing
|
|||||||
import time
|
import time
|
||||||
import redis
|
import redis
|
||||||
import config
|
import config
|
||||||
|
import fangjia
|
||||||
|
|
||||||
QUEUE = "calc_cmd"
|
QUEUE = "calc_cmd"
|
||||||
redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
|
redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
|
||||||
|
|
||||||
|
logger = fangjia.get_logger("CalcSpeedMonitor")
|
||||||
|
|
||||||
|
|
||||||
def monitor(pname):
|
def monitor(pname):
|
||||||
client = redis.Redis(connection_pool=redis_pool)
|
client = redis.Redis(connection_pool=redis_pool)
|
||||||
@@ -14,7 +17,7 @@ def monitor(pname):
|
|||||||
pre_counter = client.llen(QUEUE)
|
pre_counter = client.llen(QUEUE)
|
||||||
time.sleep(60)
|
time.sleep(60)
|
||||||
now_counter = client.llen(QUEUE)
|
now_counter = client.llen(QUEUE)
|
||||||
print(pname + "#########:".zfill(100) + str(pre_counter - now_counter) + "/min")
|
logger.info(pname + "#####:".zfill(20) + str(pre_counter - now_counter) + "/min")
|
||||||
|
|
||||||
|
|
||||||
def format_cmd(cmd):
|
def format_cmd(cmd):
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
def get_worker_num():
|
def get_worker_num():
|
||||||
return 20
|
return 15
|
||||||
|
|
||||||
|
|
||||||
def get_redis_host():
|
def get_redis_host():
|
||||||
@@ -27,7 +27,7 @@ def get_mongodb_port():
|
|||||||
|
|
||||||
|
|
||||||
def get_log_mongodb_host():
|
def get_log_mongodb_host():
|
||||||
return "192.168.0.139"
|
return "192.168.0.136"
|
||||||
# return "log.mongo.db.fangjia.com"
|
# return "log.mongo.db.fangjia.com"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ def get_logger(name):
|
|||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
logger.addHandler(handler)
|
logger.addHandler(handler)
|
||||||
|
|
||||||
file_handler = logging.FileHandler("/home/goojia/logs/price.log")
|
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log")
|
||||||
file_handler.setFormatter(formatter)
|
file_handler.setFormatter(formatter)
|
||||||
logger.addHandler(file_handler)
|
logger.addHandler(file_handler)
|
||||||
logger.setLevel("INFO")
|
logger.setLevel("INFO")
|
||||||
@@ -33,7 +33,7 @@ def get_performance_logger(name):
|
|||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
logger.addHandler(handler)
|
logger.addHandler(handler)
|
||||||
|
|
||||||
file_handler = logging.FileHandler("/home/goojia/logs/price.performance.log")
|
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log")
|
||||||
file_handler.setFormatter(formatter)
|
file_handler.setFormatter(formatter)
|
||||||
logger.addHandler(file_handler)
|
logger.addHandler(file_handler)
|
||||||
logger.setLevel("INFO")
|
logger.setLevel("INFO")
|
||||||
|
|||||||
@@ -9,10 +9,18 @@ import sell_price.zhuge0118A as sellPrice
|
|||||||
s = time.time()
|
s = time.time()
|
||||||
|
|
||||||
#上海 闵行上海康城
|
#上海 闵行上海康城
|
||||||
|
|
||||||
#深圳龙岗葵涌供销社综合商住楼
|
#深圳龙岗葵涌供销社综合商住楼
|
||||||
|
'''
|
||||||
ct = '深圳'
|
ct = '深圳'
|
||||||
rl = '龙岗'
|
rl = '龙岗'
|
||||||
lk = '葵涌供销社综合商住楼'
|
lk = '葵涌供销社综合商住楼'
|
||||||
|
'''
|
||||||
|
|
||||||
|
|
||||||
|
ct = '上海'
|
||||||
|
rl = '嘉定'
|
||||||
|
lk = '湖畔天下'
|
||||||
#weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d")
|
#weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d")
|
||||||
#for i in range(0, 100):
|
#for i in range(0, 100):
|
||||||
sellPrice.out_put_price(ct, rl, lk, fangjia.get_weekend())
|
sellPrice.out_put_price(ct, rl, lk, fangjia.get_weekend())
|
||||||
|
|||||||
Reference in New Issue
Block a user