diff options
author | GN2 | 2020-04-22 16:04:42 -0500 |
---|---|---|
committer | GN2 | 2020-04-22 16:04:42 -0500 |
commit | 9e20fbefe2e80b3fee47efcc3a5b4fab7412b140 (patch) | |
tree | b376359b923d39a76a1bcca29b21689dd00e4484 /wqflask/utility | |
parent | 410914d00a2ecb678f0d027cee79d5328dae6119 (diff) | |
parent | fff25327eafcb06d77cff8e8f925a9ab4b9e0796 (diff) | |
download | genenetwork2-9e20fbefe2e80b3fee47efcc3a5b4fab7412b140.tar.gz |
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEAD
Diffstat (limited to 'wqflask/utility')
-rw-r--r-- | wqflask/utility/startup_config.py | 4 | ||||
-rw-r--r-- | wqflask/utility/tools.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wqflask/utility/startup_config.py b/wqflask/utility/startup_config.py index 5a62cc50..817284dd 100644 --- a/wqflask/utility/startup_config.py +++ b/wqflask/utility/startup_config.py @@ -33,7 +33,7 @@ def app_config(): if page.status_code != 200: raise Exception("API server not found!") - import utility.elasticsearch_tools as es - es.test_elasticsearch_connection() + # import utility.elasticsearch_tools as es + # es.test_elasticsearch_connection() print("GN2 is running. Visit %s[http://localhost:%s/%s](%s)" % (BLUE,str(port),ENDC,get_setting("WEBSERVER_URL"))) diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py index 75bddb24..0fbedccb 100644 --- a/wqflask/utility/tools.py +++ b/wqflask/utility/tools.py @@ -267,10 +267,10 @@ if ORCID_CLIENT_ID != 'UNKNOWN' and ORCID_CLIENT_SECRET: ORCID_CLIENT_ID+"&client_secret="+ORCID_CLIENT_SECRET ORCID_TOKEN_URL = get_setting('ORCID_TOKEN_URL') -ELASTICSEARCH_HOST = get_setting('ELASTICSEARCH_HOST') -ELASTICSEARCH_PORT = get_setting('ELASTICSEARCH_PORT') -import utility.elasticsearch_tools as es -es.test_elasticsearch_connection() +# ELASTICSEARCH_HOST = get_setting('ELASTICSEARCH_HOST') +# ELASTICSEARCH_PORT = get_setting('ELASTICSEARCH_PORT') +# import utility.elasticsearch_tools as es +# es.test_elasticsearch_connection() SMTP_CONNECT = get_setting('SMTP_CONNECT') SMTP_USERNAME = get_setting('SMTP_USERNAME') |