← Back to branch summary

~anso/nova/factorycleanup

« back to all changes in this revision

Viewing changes to nova/api/ec2/metadatarequesthandler.py

  • Committer: Todd Willey
  • Date: 2011-01-12 19:31:28 UTC
  • mfrom: (524.1.4 wsgirouter)
  • Revision ID: todd@ansolabs.com-20110112193128-3o6yktau46w9mhzu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/metadatarequesthandler.py
18
18
 
19
19
"""Metadata request handler."""
20
20
 
21
 
import logging
22
 
 
23
21
import webob.dec
24
22
import webob.exc
25
23
 
 
24
from nova import log as logging
26
25
from nova import flags
27
26
from nova import wsgi
28
27
from nova.api.ec2 import cloud
29
28
 
30
29
 
 
30
LOG = logging.getLogger('nova.api.ec2.metadata')
31
31
FLAGS = flags.FLAGS
32
32
 
33
33
 
73
73
            remote_address = req.headers.get('X-Forwarded-For', remote_address)
74
74
        meta_data = cc.get_metadata(remote_address)
75
75
        if meta_data is None:
76
 
            logging.error(_('Failed to get metadata for ip: %s') %
77
 
                          remote_address)
 
76
            LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
78
77
            raise webob.exc.HTTPNotFound()
79
78
        data = self.lookup(req.path_info, meta_data)
80
79
        if data is None: