Skip to content

Commit 9ffa780

Browse files
authored
Merge pull request #6954 from roed314/beta_link
Add link to beta in timeout message
2 parents f8c6236 + e9f36a3 commit 9ffa780

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

lmfdb/utils/search_wrapper.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from random import randrange
2-
from flask import render_template, jsonify, redirect
2+
from flask import render_template, jsonify, redirect, request
3+
from urllib.parse import urlparse
34
from psycopg2.extensions import QueryCanceledError
45
from psycopg2.errors import NumericValueOutOfRange
56
from sage.misc.decorators import decorator_keywords
@@ -112,10 +113,17 @@ def query_cancelled_error(
112113
self, info, query, err, err_title, template, template_kwds
113114
):
114115
ctx = ctx_proc_userdata()
115-
flash_error(
116-
'The search query took longer than expected! Please try again later, or use https://beta.lmfdb.org. If your search still times out, please help us improve by reporting this error <a href="%s" target=_blank>here</a>.'
116+
if urlparse(request.url).netloc == "beta.lmfdb.org":
117+
flash_error(
118+
'The search query took longer than expected! Please try again later; if your search still times out, please help us improve by reporting this error <a href="%s" target=_blank>here</a>.'
117119
% ctx["feedbackpage"]
118-
)
120+
)
121+
else:
122+
beta_link = ctx["modify_url"](scheme="https", netloc="beta.lmfdb.org")
123+
flash_error(
124+
'The search query took longer than expected! The <a href="%s">same search</a> on beta.lmfdb.org may succeed (it is running on a server with faster disks). You can also try again later; if your search still times out, please help us improve by reporting this error <a href="%s" target=_blank>here</a>.'
125+
% (beta_link, ctx["feedbackpage"])
126+
)
119127
info["err"] = str(err)
120128
info["query"] = dict(query)
121129
return render_template(

0 commit comments

Comments
 (0)