From 7f8f48535cbade830c27e03bb0cf5bb1672d3c62 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 9 Apr 2018 11:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 12 ++++++------ PriceSystem/fangjia/__init__.py | 7 ++++++- PriceSystem/test.py | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 671bfa6..abb7743 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -106,12 +106,12 @@ def all_calc_cmd_finish(start_time): if __name__ == "__main__": - start_time = datetime.datetime.utcnow() - send_district_calc_cmd() - while not district_calc_cmd_finish(): - time.sleep(5) - logger.info("等待小区均价计算完成") + # start_time = datetime.datetime.utcnow() + # send_district_calc_cmd() + # while not district_calc_cmd_finish(): + # time.sleep(5) + # logger.info("等待小区均价计算完成") send_city_calc_cmd() logger.info("城市均价计算完成") - all_calc_cmd_finish(start_time) + # all_calc_cmd_finish(start_time) sys.exit(0) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index f86549f..8b3cb70 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -48,6 +48,7 @@ def get_performance_logger(name): break now = now + datetime.timedelta(days=1) + performance_logger = get_performance_logger("performance") @@ -61,7 +62,10 @@ def timer(func): arg_list = list() for arg in args: arg_list.append(str(arg)) - performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) + if elapsed > config.get_timeout() * 10: + performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) + else: + performance_logger.error("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) return rs return _timer @@ -126,6 +130,7 @@ def get_weekend(): if calendar.weekday(now.year, now.month, now.day) == 6: break now = now + datetime.timedelta(days=1) + now = now - datetime.timedelta(days=7) pacific = pytz.timezone('Asia/Shanghai') return pacific.localize(now) diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 117cba0..2cdbb71 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -8,7 +8,7 @@ import sell_price.zhuge0118A as sellPrice s = time.time() - + #上海 闵行上海康城 #深圳龙岗葵涌供销社综合商住楼 @@ -42,7 +42,7 @@ lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村 """ ct='上海' rl='长宁' -lk='绿地海怡公寓' +lk='湖南省工商局宿舍' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #洛阳涧西奥阳康城