diff options
| author | Pjotr Prins | 2017-03-06 07:34:50 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2017-03-06 07:34:50 +0000 |
| commit | 06fa7371c96976f5ec65704ab6b16e03e21a98dc (patch) | |
| tree | 875c4014e986fa29a7c6317dce3a603c524a513b /wqflask | |
| parent | 48b8b931657c65e9b5f2a3ef0dcda3d5ad223f3a (diff) | |
| download | genenetwork2-06fa7371c96976f5ec65704ab6b16e03e21a98dc.tar.gz | |
phewas: preparing for use of phewas tools
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/base/data_set.py | 2 | ||||
| -rw-r--r-- | wqflask/runserver.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 54dd3c4b..671657e8 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -328,7 +328,7 @@ class DatasetGroup(object): if check_plink_gemma(): marker_class = HumanMarkers else: - marker_class = Markers + marker_class = Markers self.markers = marker_class(self.name) diff --git a/wqflask/runserver.py b/wqflask/runserver.py index adacc712..40616223 100644 --- a/wqflask/runserver.py +++ b/wqflask/runserver.py @@ -19,16 +19,17 @@ ENDC = '\033[0m' import os app.config['SECRET_KEY'] = os.urandom(24) -from utility.tools import WEBSERVER_MODE,get_setting_int,get_setting +from utility.tools import WEBSERVER_MODE,get_setting_int,get_setting,get_setting_bool port = get_setting_int("SERVER_PORT") print("GN2 API server URL is ["+BLUE+get_setting("GN_SERVER_URL")+ENDC+"]") -import requests -page = requests.get(get_setting("GN_SERVER_URL")) -if page.status_code != 200: - raise Exception("API server not found!") +if get_setting_bool("USE_GN_SERVER"): + import requests + page = requests.get(get_setting("GN_SERVER_URL")) + if page.status_code != 200: + raise Exception("API server not found!") print("GN2 is running. Visit %s[http://localhost:%s/%s](%s)" % (BLUE,str(port),ENDC,get_setting("WEBSERVER_URL"))) |