From 5f2517978d21c91cbb762741fcf23b5a442b9179 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Tue, 17 Dec 2013 13:09:38 -0500 Subject: [PATCH] Move default DOC_STORE_CONFIG to common --- cms/envs/common.py | 2 +- cms/envs/dev.py | 6 ------ lms/envs/cms/dev.py | 6 ------ lms/envs/common.py | 6 +++++- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 0c7b3df787..df192af658 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -25,7 +25,7 @@ Longer TODO: import sys import lms.envs.common -from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL +from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG from path import path from lms.lib.xblock.mixin import LmsBlockMixin diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 0ca4266f40..16efed18c8 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -21,12 +21,6 @@ LOGGING = get_logger_config(ENV_ROOT / "log", dev_env=True, debug=True) -DOC_STORE_CONFIG = { - 'host': 'localhost', - 'db': 'xmodule', - 'collection': 'modulestore', -} - modulestore_options = { 'default_class': 'xmodule.raw_module.RawDescriptor', 'fs_root': GITHUB_REPO_ROOT, diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py index 427b7a78d2..0dca42f343 100644 --- a/lms/envs/cms/dev.py +++ b/lms/envs/cms/dev.py @@ -22,12 +22,6 @@ FEATURES['ENABLE_LMS_MIGRATION'] = False META_UNIVERSITIES = {} -DOC_STORE_CONFIG = { - 'host': 'localhost', - 'db': 'xmodule', - 'collection': 'modulestore', -} - modulestore_options = { 'default_class': 'xmodule.raw_module.RawDescriptor', 'fs_root': DATA_DIR, diff --git a/lms/envs/common.py b/lms/envs/common.py index 3e7841833a..f7f66e6a98 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -390,7 +390,11 @@ MODULESTORE = { } } CONTENTSTORE = None -DOC_STORE_CONFIG = None +DOC_STORE_CONFIG = { + 'host': 'localhost', + 'db': 'xmodule', + 'collection': 'modulestore', +} # Should we initialize the modulestores at startup, or wait until they are # needed?