Merge branch 'master' of 192.168.0.27:dev0/PriceSystem

# Conflicts:
#	PriceSystem/test.py
This commit is contained in:
2018-04-09 11:43:51 +08:00
10 changed files with 464 additions and 168 deletions
+11 -4
View File
@@ -25,7 +25,7 @@ def get_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log")
file_handler.setFormatter(formatter)
logger.addHandler(file_handler)
logger.setLevel("INFO")
logger.setLevel("ERROR")
return logger
@@ -39,7 +39,7 @@ def get_performance_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log")
file_handler.setFormatter(formatter)
logger.addHandler(file_handler)
logger.setLevel("INFO")
logger.setLevel("ERROR")
return logger
now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
@@ -157,15 +157,22 @@ 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 = 1000
pos = list(seawater105.find(query, fields).limit(lt))
>>>>>>> 9b39a072aff955aeed773a2c859e1d355ec52231
data = pandas.DataFrame(pos)
del pos
# print("==================>", time.time() - s)
return data
except:
lt = seawater105.count(query)
pos = list(seawater105.find(query).limit(lt))
lt = 100
pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt))
data = pandas.DataFrame(pos)
del pos
return data