diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 20:54:58 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 20:54:58 +0000 |
| commit | 9d4a60d6bd7621b44a1ccd4a48741f32e620f342 (patch) | |
| tree | 0904abbefd68ef786407cea494b29a064af6de12 /nova/fakerabbit.py | |
| parent | db938f975da64540ebb942e9dfd640db4dd7f939 (diff) | |
| parent | ff1575e782fb08fb3923a09cb1a18d703b33be4a (diff) | |
| download | nova-9d4a60d6bd7621b44a1ccd4a48741f32e620f342.tar.gz nova-9d4a60d6bd7621b44a1ccd4a48741f32e620f342.tar.xz nova-9d4a60d6bd7621b44a1ccd4a48741f32e620f342.zip | |
fixed conflicts
Diffstat (limited to 'nova/fakerabbit.py')
| -rw-r--r-- | nova/fakerabbit.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index 792e4c344..42daa9767 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -40,12 +40,12 @@ class Exchange(object): self._routes = {} def publish(self, message, routing_key=None): - logging.debug('(%s) publish (key: %s) %s', + logging.debug(_('(%s) publish (key: %s) %s'), self.name, routing_key, message) routing_key = routing_key.split('.')[0] if routing_key in self._routes: for f in self._routes[routing_key]: - logging.debug('Publishing to route %s', f) + logging.debug(_('Publishing to route %s'), f) f(message, routing_key=routing_key) def bind(self, callback, routing_key): @@ -75,19 +75,19 @@ class Backend(base.BaseBackend): def queue_declare(self, queue, **kwargs): global QUEUES if queue not in QUEUES: - logging.debug('Declaring queue %s', queue) + logging.debug(_('Declaring queue %s'), queue) QUEUES[queue] = Queue(queue) def exchange_declare(self, exchange, type, *args, **kwargs): global EXCHANGES if exchange not in EXCHANGES: - logging.debug('Declaring exchange %s', exchange) + logging.debug(_('Declaring exchange %s'), exchange) EXCHANGES[exchange] = Exchange(exchange, type) def queue_bind(self, queue, exchange, routing_key, **kwargs): global EXCHANGES global QUEUES - logging.debug('Binding %s to %s with key %s', + logging.debug(_('Binding %s to %s with key %s'), queue, exchange, routing_key) EXCHANGES[exchange].bind(QUEUES[queue].push, routing_key) @@ -112,7 +112,7 @@ class Backend(base.BaseBackend): content_type=content_type, content_encoding=content_encoding) message.result = True - logging.debug('Getting from %s: %s', queue, message) + logging.debug(_('Getting from %s: %s'), queue, message) return message def prepare_message(self, message_data, delivery_mode, |