Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
4270d8f0
Commit
4270d8f0
authored
Aug 29, 2014
by
Christine Lytwynec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change default settings for servers/assets paver tasks from "dev" to "devstack"
parent
118baafb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
pavelib/assets.py
+1
-1
pavelib/servers.py
+7
-6
No files found.
pavelib/assets.py
View file @
4270d8f0
...
...
@@ -207,7 +207,7 @@ def update_assets(args):
help
=
"lms or studio"
,
)
parser
.
add_argument
(
'--settings'
,
type
=
str
,
default
=
"dev"
,
'--settings'
,
type
=
str
,
default
=
"dev
stack
"
,
help
=
"Django settings module"
,
)
parser
.
add_argument
(
...
...
pavelib/servers.py
View file @
4270d8f0
...
...
@@ -10,7 +10,7 @@ from .utils.process import run_process, run_multi_processes
DEFAULT_PORT
=
{
"lms"
:
8000
,
"studio"
:
8001
}
DEFAULT_SETTINGS
=
'dev'
DEFAULT_SETTINGS
=
'dev
stack
'
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
)
exit
(
1
)
if
not
settings
:
settings
=
DEFAULT_SETTINGS
if
not
skip_assets
:
# Local dev settings use staticfiles to serve assets, so we can skip the collecstatic step
args
=
[
system
,
'--settings={}'
.
format
(
settings
),
'--skip-collect'
,
'--watch'
]
...
...
@@ -33,9 +36,6 @@ def run_server(system, settings=None, port=None, skip_assets=False):
if
port
is
None
:
port
=
DEFAULT_PORT
[
system
]
if
settings
is
None
:
settings
=
DEFAULT_SETTINGS
run_process
(
django_cmd
(
system
,
settings
,
'runserver'
,
'--traceback'
,
'--pythonpath=.'
,
'0.0.0.0:{}'
.
format
(
port
)))
...
...
@@ -78,6 +78,7 @@ def studio(options):
@task
@needs
(
'pavelib.prereqs.install_prereqs'
)
@consume_args
@no_help
def
devstack
(
args
):
"""
Start the devstack lms or studio server
...
...
@@ -115,7 +116,7 @@ def run_all_servers(options):
"""
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_cms
=
getattr
(
options
,
'settings_cms'
,
settings
)
worker_settings
=
getattr
(
options
,
'worker_settings'
,
'dev_with_worker'
)
...
...
@@ -145,7 +146,7 @@ def update_db():
"""
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
,
'migrate'
,
'--traceback'
,
'--pythonpath=.'
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment