aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuriithi Frederick Muriuki2018-02-09 11:02:07 +0300
committerMuriithi Frederick Muriuki2018-02-09 11:02:07 +0300
commit4fe60697964d81ce1425000e764fd0a27d73eb29 (patch)
treeae7f8f2ab5fe9c39e732be74154b9c47d1bc9948
parent25ff5e9e47c568547a855e42a4fd43477db2a61e (diff)
downloadgenenetwork2-4fe60697964d81ce1425000e764fd0a27d73eb29.tar.gz
Check elasticsearch at point of use
* Instead of checking for the state of elasticsearch at startup, check the state at the moment the user requests a feature that depends on elasticsearch. This reduces the chances that the user is dropped onto an exception page when elasticsearch server goes down.
-rw-r--r--wqflask/utility/elasticsearch_tools.py3
-rw-r--r--wqflask/wqflask/user_manager.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/wqflask/utility/elasticsearch_tools.py b/wqflask/utility/elasticsearch_tools.py
index a0383033..4fc0035c 100644
--- a/wqflask/utility/elasticsearch_tools.py
+++ b/wqflask/utility/elasticsearch_tools.py
@@ -8,9 +8,6 @@ try:
, "port": ELASTICSEARCH_PORT
}]) if (ELASTICSEARCH_HOST and ELASTICSEARCH_PORT) else None
- # Check if elasticsearch is running
- if not es.ping():
- es = None
except:
es = None
diff --git a/wqflask/wqflask/user_manager.py b/wqflask/wqflask/user_manager.py
index 8f09c206..630be9aa 100644
--- a/wqflask/wqflask/user_manager.py
+++ b/wqflask/wqflask/user_manager.py
@@ -626,7 +626,7 @@ class LoginUser(object):
return render_template(
"new_security/login_user.html"
, external_login=external_login
- , es_server=es)
+ , es_server=es.ping())
else:
user_details = get_user_by_unique_column("email_address", params["email_address"])
user = None