edward/depicts
1
0
Fork 0
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

Better error handling.

Browse source
This commit is contained in:
Edward Betts 2019-12-17 11:45:30 +00:00
parent f99c2512b7
commit d2cbcc4c04
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
depicts/wdqs.py
View file

@ -53,13 +53,16 @@ def record_query(query, query_template=None):
params = {'query': query, 'format': 'json'} params = {'query': query, 'format': 'json'}
start = datetime.utcnow() start = datetime.utcnow()
path = request.full_path.rstrip('?') if request else None
endpoint = request.endpoint if request else None
db_query = WikidataQuery( db_query = WikidataQuery(
start_time=start, start_time=start,
sparql_query=query, sparql_query=query,
path=request.full_path.rstrip('?'), path=path,
query_template=query_template, query_template=query_template,
page_title=getattr(g, 'title', None), page_title=getattr(g, 'title', None),
endpoint=request.endpoint) endpoint=endpoint)
database.session.add(db_query) database.session.add(db_query)
database.session.commit() database.session.commit()
@ -68,12 +71,15 @@ def record_query(query, query_template=None):
db_query.status_code = r.status_code db_query.status_code = r.status_code
if r.status_code != 200: if r.status_code != 200:
print(r.text)
db_query.error_text = r.text db_query.error_text = r.text
database.session.commit() database.session.commit()
assert r.status_code == 200 if 'java.util.concurrent.TimeoutException' in r.text:
raise QueryTimeout(params, r)
else:
raise QueryError(params, r)
database.session.commit()
return r, db_query return r, db_query
def md5_query(query): def md5_query(query):