Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
bf320f03
Commit
bf320f03
authored
4 years ago
by
Feanil Patel
Browse files
Options
Downloads
Patches
Plain Diff
Find more vars that are partially updated.
parent
75f66379
Branches
Branches containing commit
Tags
release-2020-07-09-11.20
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/envs/production.py
+13
-4
13 additions, 4 deletions
cms/envs/production.py
lms/envs/production.py
+13
-4
13 additions, 4 deletions
lms/envs/production.py
with
26 additions
and
8 deletions
cms/envs/production.py
+
13
−
4
View file @
bf320f03
...
...
@@ -47,11 +47,20 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f:
# Add the key/values from config into the global namespace of this module.
# But don't override the FEATURES dict because we do that in an additive way.
__config_copy__
=
copy
.
deepcopy
(
__config__
)
if
'
FEATURES
'
in
__config_copy__
:
del
__config_copy__
[
'
FEATURES
'
]
if
'
EVENT_TRACKING_BACKENDS
'
in
__config_copy__
:
del
__config_copy__
[
'
EVENT_TRACKING_BACKENDS
'
]
KEYS_WITH_MERGED_VALUES
=
[
'
FEATURES
'
,
'
TRACKING_BACKENDS
'
,
'
EVENT_TRACKING_BACKENDS
'
,
'
JWT_AUTH
'
,
'
CELERY_QUEUES
'
,
'
MKTG_URL_LINK_MAP
'
,
'
MKTG_URL_OVERRIDES
'
,
]
for
key
in
KEYS_WITH_MERGED_VALUES
:
if
key
in
__config_copy__
:
del
__config_copy__
[
key
]
vars
().
update
(
__config_copy__
)
...
...
This diff is collapsed.
Click to expand it.
lms/envs/production.py
+
13
−
4
View file @
bf320f03
...
...
@@ -59,11 +59,20 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f:
# Add the key/values from config into the global namespace of this module.
# But don't override the FEATURES dict because we do that in an additive way.
__config_copy__
=
copy
.
deepcopy
(
__config__
)
if
'
FEATURES
'
in
__config_copy__
:
del
__config_copy__
[
'
FEATURES
'
]
if
'
EVENT_TRACKING_BACKENDS
'
in
__config_copy__
:
del
__config_copy__
[
'
EVENT_TRACKING_BACKENDS
'
]
KEYS_WITH_MERGED_VALUES
=
[
'
FEATURES
'
,
'
TRACKING_BACKENDS
'
,
'
EVENT_TRACKING_BACKENDS
'
,
'
JWT_AUTH
'
,
'
CELERY_QUEUES
'
,
'
MKTG_URL_LINK_MAP
'
,
'
MKTG_URL_OVERRIDES
'
,
]
for
key
in
KEYS_WITH_MERGED_VALUES
:
if
key
in
__config_copy__
:
del
__config_copy__
[
key
]
vars
().
update
(
__config_copy__
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment