Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
This commit is contained in:
@@ -1 +0,0 @@
|
||||
,luogan,luogan-Precision-Tower-3620,09.04.2018 09:15,file:///home/luogan/.config/libreoffice/4;
|
||||
@@ -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
|
||||
@@ -121,6 +125,10 @@ def get_region(city):
|
||||
|
||||
|
||||
def get_weekend():
|
||||
"""
|
||||
返回本周周末
|
||||
:return:
|
||||
"""
|
||||
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:
|
||||
@@ -152,12 +160,18 @@ def findHouse(query, fields=None):
|
||||
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
|
||||
for err_count in range(0, 10):
|
||||
try:
|
||||
<<<<<<< HEAD
|
||||
|
||||
lt = 100
|
||||
# seawater.find(query,{"p_date":-1}).sort([("p_date",-1)])
|
||||
pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt))
|
||||
#pos = list(seawater105.find(query, fields).limit(lt))
|
||||
|
||||
=======
|
||||
lt = 100
|
||||
# seawater.find(query,{"p_date":-1}).sort([("p_date",-1)])
|
||||
pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt))
|
||||
>>>>>>> d253c17cae80aab0340965a2bd161f1aea95d180
|
||||
data = pandas.DataFrame(pos)
|
||||
del pos
|
||||
# print("==================>", time.time() - s)
|
||||
|
||||
Reference in New Issue
Block a user