Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
This commit is contained in:
@@ -42,11 +42,6 @@ def get_performance_logger(name):
|
||||
logger.setLevel("INFO")
|
||||
|
||||
return logger
|
||||
now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
for day in range(1, 9):
|
||||
if calendar.weekday(now.year, now.month, now.day) == 6:
|
||||
break
|
||||
now = now + datetime.timedelta(days=1)
|
||||
|
||||
performance_logger = get_performance_logger("performance")
|
||||
|
||||
@@ -61,7 +56,12 @@ def timer(func):
|
||||
arg_list = list()
|
||||
for arg in args:
|
||||
arg_list.append(str(arg))
|
||||
<<<<<<< HEAD
|
||||
performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list))
|
||||
=======
|
||||
if elapsed > config.get_timeout():
|
||||
performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list))
|
||||
>>>>>>> e3a1832f8bd0e1fa8d774d73005729d3c862b083
|
||||
return rs
|
||||
|
||||
return _timer
|
||||
|
||||
Reference in New Issue
Block a user