← Back to branch summary

~rlane/nova/lp773690

« back to all changes in this revision

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

  • Committer: rlane at wikimedia
  • Date: 2011-04-29 22:30:40 UTC
  • mfrom: (382.1.655 nova)
  • Revision ID: rlane@wikimedia.org-20110429223040-i0x3ds9eqwrabyru
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/__init__.py
46
46
                     'Number of minutes to lockout if triggered.')
47
47
flags.DEFINE_integer('lockout_window', 15,
48
48
                     'Number of minutes for lockout window.')
49
 
flags.DEFINE_list('lockout_memcached_servers', None,
50
 
                  'Memcached servers or None for in process cache.')
51
49
 
52
50
 
53
51
class RequestLogging(wsgi.Middleware):
107
105
 
108
106
    def __init__(self, application):
109
107
        """middleware can use fake for testing."""
110
 
        if FLAGS.lockout_memcached_servers:
 
108
        if FLAGS.memcached_servers:
111
109
            import memcache
112
110
        else:
113
111
            from nova import fakememcache as memcache
114
 
        self.mc = memcache.Client(FLAGS.lockout_memcached_servers,
 
112
        self.mc = memcache.Client(FLAGS.memcached_servers,
115
113
                                  debug=0)
116
114
        super(Lockout, self).__init__(application)
117
115
 
322
320
        except exception.InstanceNotFound as ex:
323
321
            LOG.info(_('InstanceNotFound raised: %s'), unicode(ex),
324
322
                     context=context)
325
 
            ec2_id = ec2utils.id_to_ec2_id(ex.instance_id)
326
 
            message = _('Instance %s not found') % ec2_id
327
 
            return self._error(req, context, type(ex).__name__, message)
 
323
            return self._error(req, context, type(ex).__name__, ex.message)
328
324
        except exception.VolumeNotFound as ex:
329
325
            LOG.info(_('VolumeNotFound raised: %s'), unicode(ex),
330
326
                     context=context)