jiazhizhong/py12306
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化错误提示

Browse Source
This commit is contained in:
Jalin
2019-01-22 22:16:15 +08:00
parent fe5e82f2ff
commit 61961e515c
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
py12306/helpers/request.py
View File

@@ -53,14 +53,17 @@ class Request(HTMLSession):
def request(self, *args, **kwargs): # 拦截所有错误 def request(self, *args, **kwargs): # 拦截所有错误
try: try:
return super().request(*args, **kwargs) response = super().request(*args, **kwargs)
return response
except RequestException as e: except RequestException as e:
from py12306.log.common_log import CommonLog
if e.response: if e.response:
response = e.response response = e.response
else: else:
response = HTMLResponse(HTMLSession) response = HTMLResponse(HTMLSession)
response.status_code = 500 # response.status_code = 500
expand_class(response, 'json', Request.json) expand_class(response, 'json', Request.json)
response.reason = response.reason if response.reason else CommonLog.MESSAGE_RESPONSE_EMPTY_ERROR
return response return response
def cdn_request(self, url: str, cdn=None, method='GET', **kwargs): def cdn_request(self, url: str, cdn=None, method='GET', **kwargs):

4
py12306/log/query_log.py
View File

@@ -170,8 +170,8 @@ class QueryLog(BaseLog):
return self return self
@classmethod @classmethod
def add_query_time_log(cls, start, end, is_cdn): def add_query_time_log(cls, time, is_cdn):
return cls().add_log(('*' if is_cdn else '') + '耗时 %.2f' % (end - start)) return cls().add_log(('*' if is_cdn else '') + '耗时 %.2f' % time)
@classmethod @classmethod
def add_stay_log(cls, second): def add_stay_log(cls, second):

4
py12306/query/job.py
View File

@@ -103,11 +103,9 @@ class Job:
self.refresh_station(station) self.refresh_station(station)
for date in self.left_dates: for date in self.left_dates:
self.left_date = date self.left_date = date
tmp_start_time = time.time()
response = self.query_by_date(date) response = self.query_by_date(date)
tmp_end_time = time.time() # 耗时
self.handle_response(response) self.handle_response(response)
QueryLog.add_query_time_log(tmp_start_time, tmp_end_time, is_cdn=self.is_cdn) QueryLog.add_query_time_log(time=response.elapsed.total_seconds(), is_cdn=self.is_cdn)
if not self.is_alive: return if not self.is_alive: return
self.safe_stay() self.safe_stay()
if is_main_thread(): if is_main_thread():