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
0acccf2f
Commit
0acccf2f
authored
Apr 27, 2016
by
David Ormsbee
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12280 from edx/release
Release to Master (2016-04-26 release)
parents
19b92429
7d7d5a16
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
openedx/core/lib/block_structure/cache.py
+4
-4
openedx/core/lib/block_structure/transformers.py
+1
-1
No files found.
openedx/core/lib/block_structure/cache.py
View file @
0acccf2f
...
@@ -48,7 +48,7 @@ class BlockStructureCache(object):
...
@@ -48,7 +48,7 @@ class BlockStructureCache(object):
self
.
_encode_root_cache_key
(
block_structure
.
root_block_usage_key
),
self
.
_encode_root_cache_key
(
block_structure
.
root_block_usage_key
),
zp_data_to_cache
zp_data_to_cache
)
)
logger
.
debug
(
logger
.
info
(
"Wrote BlockStructure
%
s to cache, size:
%
s"
,
"Wrote BlockStructure
%
s to cache, size:
%
s"
,
block_structure
.
root_block_usage_key
,
block_structure
.
root_block_usage_key
,
len
(
zp_data_to_cache
),
len
(
zp_data_to_cache
),
...
@@ -77,13 +77,13 @@ class BlockStructureCache(object):
...
@@ -77,13 +77,13 @@ class BlockStructureCache(object):
# Find root_block_usage_key in the cache.
# Find root_block_usage_key in the cache.
zp_data_from_cache
=
self
.
_cache
.
get
(
self
.
_encode_root_cache_key
(
root_block_usage_key
))
zp_data_from_cache
=
self
.
_cache
.
get
(
self
.
_encode_root_cache_key
(
root_block_usage_key
))
if
not
zp_data_from_cache
:
if
not
zp_data_from_cache
:
logger
.
debug
(
logger
.
info
(
"Did not find BlockStructure
%
r in the cache."
,
"Did not find BlockStructure
%
r in the cache."
,
root_block_usage_key
,
root_block_usage_key
,
)
)
return
None
return
None
else
:
else
:
logger
.
debug
(
logger
.
info
(
"Read BlockStructure
%
r from cache, size:
%
s"
,
"Read BlockStructure
%
r from cache, size:
%
s"
,
root_block_usage_key
,
root_block_usage_key
,
len
(
zp_data_from_cache
),
len
(
zp_data_from_cache
),
...
@@ -109,7 +109,7 @@ class BlockStructureCache(object):
...
@@ -109,7 +109,7 @@ class BlockStructureCache(object):
the cache.
the cache.
"""
"""
self
.
_cache
.
delete
(
self
.
_encode_root_cache_key
(
root_block_usage_key
))
self
.
_cache
.
delete
(
self
.
_encode_root_cache_key
(
root_block_usage_key
))
logger
.
debug
(
logger
.
info
(
"Deleted BlockStructure
%
r from the cache."
,
"Deleted BlockStructure
%
r from the cache."
,
root_block_usage_key
,
root_block_usage_key
,
)
)
...
...
openedx/core/lib/block_structure/transformers.py
View file @
0acccf2f
...
@@ -99,7 +99,7 @@ class BlockStructureTransformers(object):
...
@@ -99,7 +99,7 @@ class BlockStructureTransformers(object):
outdated_transformers
.
append
(
transformer
)
outdated_transformers
.
append
(
transformer
)
if
outdated_transformers
:
if
outdated_transformers
:
logger
.
debug
(
logger
.
info
(
"Collected Block Structure data for the following transformers is outdated: '
%
s'."
,
"Collected Block Structure data for the following transformers is outdated: '
%
s'."
,
[(
transformer
.
name
(),
transformer
.
VERSION
)
for
transformer
in
outdated_transformers
],
[(
transformer
.
name
(),
transformer
.
VERSION
)
for
transformer
in
outdated_transformers
],
)
)
...
...
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