diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 747cd88..671bfa6 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -22,7 +22,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) -logger = fangjia.get_logger("CalcCmdReceiver") +logger = fangjia.get_logger("CalcCmdSender") def get_district(city): diff --git a/PriceSystem/CalcSpeedMonitor.py b/PriceSystem/CalcSpeedMonitor.py index 715f423..5049b3b 100644 --- a/PriceSystem/CalcSpeedMonitor.py +++ b/PriceSystem/CalcSpeedMonitor.py @@ -3,10 +3,13 @@ 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) @@ -14,7 +17,7 @@ def monitor(pname): pre_counter = client.llen(QUEUE) time.sleep(60) 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): diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 2de3607..f397454 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -1,5 +1,5 @@ def get_worker_num(): - return 20 + return 15 def get_redis_host(): @@ -27,7 +27,7 @@ def get_mongodb_port(): def get_log_mongodb_host(): - return "192.168.0.139" + return "192.168.0.136" # return "log.mongo.db.fangjia.com" diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 75fa840..92c57c8 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -19,7 +19,7 @@ def get_logger(name): handler.setFormatter(formatter) 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) logger.addHandler(file_handler) logger.setLevel("INFO") @@ -33,7 +33,7 @@ def get_performance_logger(name): handler.setFormatter(formatter) 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) logger.addHandler(file_handler) logger.setLevel("INFO") diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 27241b5..f90ad9f 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -9,10 +9,18 @@ import sell_price.zhuge0118A as sellPrice s = time.time() #上海 闵行上海康城 + #深圳龙岗葵涌供销社综合商住楼 +''' ct = '深圳' rl = '龙岗' lk = '葵涌供销社综合商住楼' +''' + + +ct = '上海' +rl = '嘉定' +lk = '湖畔天下' #weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d") #for i in range(0, 100): sellPrice.out_put_price(ct, rl, lk, fangjia.get_weekend())