diff --git a/PriceSystem/CalcCmdReceiver.py b/PriceSystem/CalcCmdReceiver.py index 722b11d..59761c9 100644 --- a/PriceSystem/CalcCmdReceiver.py +++ b/PriceSystem/CalcCmdReceiver.py @@ -27,15 +27,15 @@ def worker(): logger.info("等待接受计算命令") else: cmd = format_cmd(cmd) - start_time = time.clock() + start_time = time.time() try: sell_price.calc_sell_price(cmd) - end_time = time.clock() + end_time = time.time() logger.info("Calc SUC:" + str(cmd) + "\t计算成功,耗时:" + str(end_time - start_time)) except Exception as ex: print(ex) logger.exception(ex) - end_time = time.clock() + end_time = time.time() logger.error("Calc ERROR :" + str(cmd) + "\t计算失败,耗时:" + (end_time - start_time)) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index cff9cc1..22ebbf5 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -53,9 +53,9 @@ performance_logger = get_performance_logger("performance") def timer(func): def _timer(*args, **kw): - begin = time.clock() + begin = time.time() rs = func(*args, **kw) - end = time.clock() + end = time.time() elapsed = end - begin if elapsed > config.get_timeout(): arg_list = list() @@ -273,11 +273,15 @@ def dis_feature(query, fields=None): # db1 = client1.fangjia # dsf = db1.average_statistics # s = time.time() +<<<<<<< HEAD seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017) seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) +======= + seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) +>>>>>>> e4b1ed00dfb6a7e299cc5ff75f8b3b4c7f5cf8f4 for err_count in range(0, 10): try: