aboutsummaryrefslogtreecommitdiff
path: root/wqflask/runserver.py
diff options
context:
space:
mode:
authorzsloan2018-04-13 15:47:42 +0000
committerzsloan2018-04-13 15:47:42 +0000
commiteb24f53d7f5210ead3748772bb4126f78520f32c (patch)
treee58268dc13fb494818095021bf5e8510da6f7684 /wqflask/runserver.py
parent9276e5eee9be7ed37fda5ea88aec2f1a238864ad (diff)
parent270f86c41f7c90cc4ca51bca0aec789a09a36a0e (diff)
downloadgenenetwork2-eb24f53d7f5210ead3748772bb4126f78520f32c.tar.gz
Resolved conflicts for pulling from testing branch
Diffstat (limited to 'wqflask/runserver.py')
-rw-r--r--wqflask/runserver.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/wqflask/runserver.py b/wqflask/runserver.py
index a0c76e51..5f41d04d 100644
--- a/wqflask/runserver.py
+++ b/wqflask/runserver.py
@@ -21,22 +21,9 @@ GREEN = '\033[92m'
BOLD = '\033[1m'
ENDC = '\033[0m'
-import os
-app.config['SECRET_KEY'] = os.urandom(24)
+from utility.startup_config import app_config
-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+"]")
-
-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")))
+app_config()
werkzeug_logger = logging.getLogger('werkzeug')