Blame 0005-Fix-i18n-in-glance.notifier.notify_kombu.patch
|
 |
bee8b13 |
From 54622953c4cc09196c7f16d8229ba438afbe626f Mon Sep 17 00:00:00 2001
|
|
|
bee8b13 |
From: Brian Waldon <bcwaldon@gmail.com>
|
|
|
bee8b13 |
Date: Sun, 22 Apr 2012 22:21:53 -0700
|
|
|
bee8b13 |
Subject: [PATCH] Fix i18n in glance.notifier.notify_kombu
|
|
|
bee8b13 |
|
|
|
bee8b13 |
* Fixes bug 983829
|
|
|
bee8b13 |
|
|
|
bee8b13 |
Change-Id: Ibc5ec12e97e69797d1952c020c3091f42480abec
|
|
|
bee8b13 |
---
|
|
|
bee8b13 |
glance/notifier/notify_kombu.py | 5 +++--
|
|
|
bee8b13 |
1 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
bee8b13 |
|
|
|
bee8b13 |
diff --git a/glance/notifier/notify_kombu.py b/glance/notifier/notify_kombu.py
|
|
|
bee8b13 |
index b3447d6..6623fdc 100644
|
|
|
bee8b13 |
--- a/glance/notifier/notify_kombu.py
|
|
|
bee8b13 |
+++ b/glance/notifier/notify_kombu.py
|
|
|
bee8b13 |
@@ -166,8 +166,9 @@ class RabbitStrategy(strategy.Strategy):
|
|
|
bee8b13 |
|
|
|
bee8b13 |
def log_failure(self, msg, priority):
|
|
|
bee8b13 |
"""Fallback to logging when we can't send to rabbit."""
|
|
|
bee8b13 |
- logger.error(_('Notification with priority %(priority)s failed; '
|
|
|
bee8b13 |
- 'msg=%s') % msg)
|
|
|
bee8b13 |
+ message = _('Notification with priority %(priority)s failed: '
|
|
|
bee8b13 |
+ 'msg=%(msg)s')
|
|
|
bee8b13 |
+ logger.error(message % {'msg': msg, 'priority': priority})
|
|
|
bee8b13 |
|
|
|
bee8b13 |
def _send_message(self, msg, routing_key):
|
|
|
bee8b13 |
"""Send a message. Caller needs to catch exceptions for retry."""
|