1 files changed, 46 insertions, 31 deletions
diff --git a/wqflask/runserver.py b/wqflask/runserver.py
index e4392b3f..12ec904e 100755..100644
--- a/wqflask/runserver.py
+++ b/wqflask/runserver.py
@@ -1,36 +1,51 @@
-from wqflask import app
-
-# Please note, running with host set externally below combined with debug mode
-# is a big security no-no
-# Unless you have a firewall setup
-#
-# Something like /sbin/iptables -A INPUT -p tcp -i eth0 -s ! 71.236.239.43 --dport 5000 -j DROP
-# should do the trick
+# Starts the webserver with the ./bin/genenetwork2 command
 #
-# You'll probably have to firewall the main port and the
+# Please note, running with host set externally below combined with
+# debug mode is a security risk unless you have a firewall setup, e.g.
 #
-# For more info see: http://www.cyberciti.biz/faq/iptables-block-port/
+# /sbin/iptables -A INPUT -p tcp -i eth0 -s ! 71.236.239.43 --dport 5003 -j DROP
 
-#import logging
-#logging.basicConfig(filename="/tmp/flask_gn_log", level=logging.INFO)
-#
-#_log = logging.getLogger("search")
-#_ch = logging.StreamHandler()
-#_log.addHandler(_ch)
-
-print app.config
+from wqflask import app
 
 import logging
-file_handler = logging.FileHandler(app.config['LOGFILE'])
-file_handler.setLevel(logging.DEBUG)
-app.logger.addHandler(file_handler)
-
-# import logging_tree
-# logging_tree.printout()
-
-app.run(host='0.0.0.0',
-        port=app.config['SERVER_PORT'],
-        debug=True,
-        use_debugger=True,
-        threaded=True,
-        use_reloader=True)
+import utility.logger
+logger = utility.logger.getLogger(__name__ )
+
+BLUE  = '\033[94m'
+GREEN = '\033[92m'
+BOLD  = '\033[1m'
+ENDC  = '\033[0m'
+
+logger.info("GN2 is running. Visit %shttp://localhost:5003/%s" % (BLUE,ENDC))
+
+import os
+app.config['SECRET_KEY'] = os.urandom(24)
+
+from utility.tools import WEBSERVER_MODE
+
+werkzeug_logger = logging.getLogger('werkzeug')
+
+if WEBSERVER_MODE == 'DEBUG':
+    app.run(host='0.0.0.0',
+            port=app.config['SERVER_PORT'],
+            debug=True,
+            use_debugger=True,
+            threaded=False,
+            use_reloader=True)
+elif WEBSERVER_MODE == 'DEV':
+    werkzeug_logger.setLevel(logging.WARNING)
+    app.run(host='0.0.0.0',
+            port=app.config['SERVER_PORT'],
+            debug=False,
+            use_debugger=False,
+            threaded=False,
+            processes=0,
+            use_reloader=True)
+else: #production mode
+    app.run(host='0.0.0.0',
+            port=app.config['SERVER_PORT'],
+            debug=False,
+            use_debugger=False,
+            threaded=True,
+            processes=8,
+            use_reloader=True)