openstack
/
glance
Code Issues Proposed changes

Adding request context handling

This commit is contained in:
Rick Harris 2011-07-25 13:53:12 -05:00
parent 957e4d1831
commit 8cd0510d4b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance/api/__init__.py
View File

@ -31,8 +31,9 @@ class BaseController(object):
:raises HTTPNotFound if image does not exist
"""
context = request.context
try:
return registry.get_image_metadata(self.options, id)
return registry.get_image_metadata(self.options, context, id)
except exception.NotFound:
msg = "Image with identifier %s not found" % id
logger.debug(msg)

5
glance/image_cache/prefetcher.py
View File

@ -24,6 +24,7 @@ import stat
import time
from glance.common import config
from glance.common import context
from glance.image_cache import ImageCache
from glance import registry
from glance.store import get_from_backend
@ -38,7 +39,9 @@ class Prefetcher(object):
self.cache = ImageCache(options)
def fetch_image_into_cache(self, image_id):
image_meta = registry.get_image_metadata(self.options, image_id)
ctx = context.RequestContext(is_admin=True, show_deleted=True)
image_meta = registry.get_image_metadata(
self.options, ctx, image_id)
with self.cache.open(image_meta, "wb") as cache_file:
chunks = get_from_backend(image_meta['location'],
expected_size=image_meta['size'],