aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorPjotr Prins2016-06-19 08:03:46 +0000
committerPjotr Prins2016-06-19 08:03:46 +0000
commitd67d55b023edf7e9419e5c886753a9d6a842af31 (patch)
tree16a0e1ab8b82d973ff8acf06ad73806603c37f57 /wqflask
parentc3b63a23558b12ab7a17d4bbec730cc1f284e187 (diff)
downloadgenenetwork2-d67d55b023edf7e9419e5c886753a9d6a842af31.tar.gz
Renamed settings so they are grouped together
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/maintenance/gen_select_dataset.py4
-rw-r--r--wqflask/utility/tools.py2
-rw-r--r--wqflask/wqflask/database.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/wqflask/maintenance/gen_select_dataset.py b/wqflask/maintenance/gen_select_dataset.py
index f91d3d88..d39bf4a5 100644
--- a/wqflask/maintenance/gen_select_dataset.py
+++ b/wqflask/maintenance/gen_select_dataset.py
@@ -258,7 +258,7 @@ def build_datasets(species, group, type_name):
def main():
"""Generates and outputs (as json file) the data for the main dropdown menus on the home page"""
- parse_db_uri(zach_settings.DB_URI)
+ parse_db_uri(zach_settings.SQL_URI)
species = get_species()
groups = get_groups(species)
@@ -297,6 +297,6 @@ def _test_it():
#print("build_datasets:", pf(datasets))
if __name__ == '__main__':
- Conn = MySQLdb.Connect(**parse_db_uri(zach_settings.DB_URI))
+ Conn = MySQLdb.Connect(**parse_db_uri(zach_settings.SQL_URI))
Cursor = Conn.cursor()
main()
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index bfb379f2..2affd130 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -169,7 +169,7 @@ def show_settings():
# Cached values
WEBSERVER_MODE = get_setting('WEBSERVER_MODE')
LOG_LEVEL = get_setting('LOG_LEVEL')
-DEBUG_LOG_LEVEL = get_setting_int('DEBUG_LOG_LEVEL')
+LOG_LEVEL_DEBUG = get_setting_int('LOG_LEVEL_DEBUG')
LOG_SQL = get_setting_bool('LOG_SQL')
USE_REDIS = get_setting_bool('USE_REDIS')
diff --git a/wqflask/wqflask/database.py b/wqflask/wqflask/database.py
index 90612348..d7a1c8a8 100644
--- a/wqflask/wqflask/database.py
+++ b/wqflask/wqflask/database.py
@@ -4,7 +4,7 @@ from sqlalchemy.ext.declarative import declarative_base
from wqflask import app
#engine = create_engine('sqlite:////tmp/test.db', convert_unicode=True)
-engine = create_engine(app.config['DB_URI'], convert_unicode=True)
+engine = create_engine(app.config['SQL_URI'], convert_unicode=True)
db_session = scoped_session(sessionmaker(autocommit=False,
autoflush=False,