From df7c405845e1fe6436083e7781abb3d1b178624f Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 20 Mar 2012 12:43:09 +0100 Subject: Disable query logging for now, so we get nicer logs As the queries are quite verbose, disable them for now. Reenabling them should be done in the central logging config, which is another story for celery and bin/gmg. --- mediagoblin/db/sql/open.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/db/sql/open.py') diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py index b1f389e8..9819b468 100644 --- a/mediagoblin/db/sql/open.py +++ b/mediagoblin/db/sql/open.py @@ -43,7 +43,7 @@ class DatabaseMaster(object): def setup_connection_and_db_from_config(app_config): engine = create_engine(app_config['sql_engine']) - logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) + # logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) Session.configure(bind=engine) return "dummy conn", DatabaseMaster(engine) -- cgit v1.2.3 From 39fd817ab8c4745187e5e1992d2f2866de38e2c2 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 20 Mar 2012 12:32:11 +0100 Subject: Import "Base" from base instead of models. Import the "Base" class for models from db.sql.base instead of db.sql.models. --- mediagoblin/db/sql/open.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mediagoblin/db/sql/open.py') diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py index 9819b468..7362b1c5 100644 --- a/mediagoblin/db/sql/open.py +++ b/mediagoblin/db/sql/open.py @@ -18,8 +18,7 @@ from sqlalchemy import create_engine import logging -from mediagoblin.db.sql.base import Session -from mediagoblin.db.sql.models import Base +from mediagoblin.db.sql.base import Base, Session class DatabaseMaster(object): -- cgit v1.2.3 From b829595334e10454a6528bdac944d781f6102145 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 20 Mar 2012 12:39:15 +0100 Subject: Create load_models(). So all models are ready when connecting to the db and so our "db" object has all models listed on it, create a function to load all models from the media_types, etc. Call it in setup_database() Problem: This gives celery warnings, because celery is imported before being setup properly. No idea how to fix this now. So media-type loading is excluded from load_models for now. --- mediagoblin/db/sql/open.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mediagoblin/db/sql/open.py') diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py index 7362b1c5..2520bb49 100644 --- a/mediagoblin/db/sql/open.py +++ b/mediagoblin/db/sql/open.py @@ -20,6 +20,8 @@ import logging from mediagoblin.db.sql.base import Base, Session +_log = logging.getLogger(__name__) + class DatabaseMaster(object): def __init__(self, engine): @@ -40,6 +42,16 @@ class DatabaseMaster(object): Session.remove() +def load_models(app_config): + import mediagoblin.db.sql.models + + # TODO/Fix: This breaks celery + if False: + for media_type in app_config['media_types']: + _log.debug("Loading %s.models", media_type) + __import__(media_type + ".models") + + def setup_connection_and_db_from_config(app_config): engine = create_engine(app_config['sql_engine']) # logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) -- cgit v1.2.3 From e136ad3ed613b1c2b42093be687e3aea9889e5b3 Mon Sep 17 00:00:00 2001 From: Elrond Date: Wed, 21 Mar 2012 21:46:07 +0100 Subject: Finally load all models. Load all models for the media_types. This was stopped by a celery problem. But that is now fixed. --- mediagoblin/db/sql/open.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mediagoblin/db/sql/open.py') diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py index 2520bb49..edbf0785 100644 --- a/mediagoblin/db/sql/open.py +++ b/mediagoblin/db/sql/open.py @@ -45,8 +45,7 @@ class DatabaseMaster(object): def load_models(app_config): import mediagoblin.db.sql.models - # TODO/Fix: This breaks celery - if False: + if True: for media_type in app_config['media_types']: _log.debug("Loading %s.models", media_type) __import__(media_type + ".models") -- cgit v1.2.3