Commit 4270d8f0 by Christine Lytwynec

change default settings for servers/assets paver tasks from "dev" to "devstack"

parent 118baafb
...@@ -207,7 +207,7 @@ def update_assets(args): ...@@ -207,7 +207,7 @@ def update_assets(args):
help="lms or studio", help="lms or studio",
) )
parser.add_argument( parser.add_argument(
'--settings', type=str, default="dev", '--settings', type=str, default="devstack",
help="Django settings module", help="Django settings module",
) )
parser.add_argument( parser.add_argument(
......
...@@ -10,7 +10,7 @@ from .utils.process import run_process, run_multi_processes ...@@ -10,7 +10,7 @@ from .utils.process import run_process, run_multi_processes
DEFAULT_PORT = {"lms": 8000, "studio": 8001} DEFAULT_PORT = {"lms": 8000, "studio": 8001}
DEFAULT_SETTINGS = 'dev' DEFAULT_SETTINGS = 'devstack'
def run_server(system, settings=None, port=None, skip_assets=False): def run_server(system, settings=None, port=None, skip_assets=False):
...@@ -25,6 +25,9 @@ def run_server(system, settings=None, port=None, skip_assets=False): ...@@ -25,6 +25,9 @@ def run_server(system, settings=None, port=None, skip_assets=False):
print("System must be either lms or studio", file=sys.stderr) print("System must be either lms or studio", file=sys.stderr)
exit(1) exit(1)
if not settings:
settings = DEFAULT_SETTINGS
if not skip_assets: if not skip_assets:
# Local dev settings use staticfiles to serve assets, so we can skip the collecstatic step # Local dev settings use staticfiles to serve assets, so we can skip the collecstatic step
args = [system, '--settings={}'.format(settings), '--skip-collect', '--watch'] args = [system, '--settings={}'.format(settings), '--skip-collect', '--watch']
...@@ -33,9 +36,6 @@ def run_server(system, settings=None, port=None, skip_assets=False): ...@@ -33,9 +36,6 @@ def run_server(system, settings=None, port=None, skip_assets=False):
if port is None: if port is None:
port = DEFAULT_PORT[system] port = DEFAULT_PORT[system]
if settings is None:
settings = DEFAULT_SETTINGS
run_process(django_cmd( run_process(django_cmd(
system, settings, 'runserver', '--traceback', system, settings, 'runserver', '--traceback',
'--pythonpath=.', '0.0.0.0:{}'.format(port))) '--pythonpath=.', '0.0.0.0:{}'.format(port)))
...@@ -78,6 +78,7 @@ def studio(options): ...@@ -78,6 +78,7 @@ def studio(options):
@task @task
@needs('pavelib.prereqs.install_prereqs') @needs('pavelib.prereqs.install_prereqs')
@consume_args @consume_args
@no_help
def devstack(args): def devstack(args):
""" """
Start the devstack lms or studio server Start the devstack lms or studio server
...@@ -115,7 +116,7 @@ def run_all_servers(options): ...@@ -115,7 +116,7 @@ def run_all_servers(options):
""" """
Runs Celery workers, Studio, and LMS. Runs Celery workers, Studio, and LMS.
""" """
settings = getattr(options, 'settings', 'dev') settings = getattr(options, 'settings', DEFAULT_SETTINGS)
settings_lms = getattr(options, 'settings_lms', settings) settings_lms = getattr(options, 'settings_lms', settings)
settings_cms = getattr(options, 'settings_cms', settings) settings_cms = getattr(options, 'settings_cms', settings)
worker_settings = getattr(options, 'worker_settings', 'dev_with_worker') worker_settings = getattr(options, 'worker_settings', 'dev_with_worker')
...@@ -145,7 +146,7 @@ def update_db(): ...@@ -145,7 +146,7 @@ def update_db():
""" """
Runs syncdb and then migrate. Runs syncdb and then migrate.
""" """
settings = getattr(options, 'settings', 'dev') settings = getattr(options, 'settings', DEFAULT_SETTINGS)
sh(django_cmd('lms', settings, 'syncdb', '--traceback', '--pythonpath=.')) sh(django_cmd('lms', settings, 'syncdb', '--traceback', '--pythonpath=.'))
sh(django_cmd('lms', settings, 'migrate', '--traceback', '--pythonpath=.')) sh(django_cmd('lms', settings, 'migrate', '--traceback', '--pythonpath=.'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment