diff options
| author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
|---|---|---|
| committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-03-26 14:10:22 -0400 |
| commit | c16b8196631e5b1c4cbe618a9af74f5455fe861c (patch) | |
| tree | 5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/init | |
| parent | 28f364bd6d488955952aebe86033e5ba148da2fb (diff) | |
| parent | 7ccf41818581743c2e16935cd7308ad3d6694149 (diff) | |
| download | mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip | |
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to
processing/__init__.py, and putting the comment deletion tests back into
test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/__init__.py | 5 | ||||
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index 7ac59db1..1d8115cb 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -24,7 +24,7 @@ from mediagoblin.init.config import ( from mediagoblin import mg_globals from mediagoblin.mg_globals import setup_globals from mediagoblin.db.open import setup_connection_and_db_from_config, \ - check_db_migrations_current + check_db_migrations_current, load_models from mediagoblin.workbench import WorkbenchManager from mediagoblin.storage import storage_system_from_config @@ -56,6 +56,9 @@ def setup_global_and_app_config(config_path): def setup_database(): app_config = mg_globals.app_config + # Load all models for media types (plugins, ...) + load_models(app_config) + # Set up the database connection, db = setup_connection_and_db_from_config(app_config) diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 29ccd83a..67b020c3 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -18,7 +18,7 @@ import os import sys -MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing'] +MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task'] DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module' |