summaryrefslogtreecommitdiffstats
path: root/openstack/common/log.py
diff options
context:
space:
mode:
authorAndrew Bogott <abogott@wikimedia.org>2012-07-19 03:34:31 -0500
committerAndrew Bogott <abogott@wikimedia.org>2012-08-02 18:11:37 -0500
commitc767e9beffe4b826eac869ce7e2eef2cc1499bbe (patch)
tree71e7bb4e8495db8e924ab355483781df32a6190e /openstack/common/log.py
parentbcb424dd730a977aeaae9f6e33e9bb35cbc0c062 (diff)
downloadoslo-c767e9beffe4b826eac869ce7e2eef2cc1499bbe.tar.gz
oslo-c767e9beffe4b826eac869ce7e2eef2cc1499bbe.tar.xz
oslo-c767e9beffe4b826eac869ce7e2eef2cc1499bbe.zip
Add multiple-driver support to the notifier api.
Move all of the functionality previously provided by the list_notifier into the basic notifier api. Move and restructure tests accordingly. Remove the list_notifier file and test file. For bug 1025820 Change-Id: Idf7cb975dd78e9951188781622a4d10ca466b154
Diffstat (limited to 'openstack/common/log.py')
-rw-r--r--openstack/common/log.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py
index 76962c2..49e6107 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -247,10 +247,9 @@ class JSONFormatter(logging.Formatter):
class PublishErrorsHandler(logging.Handler):
def emit(self, record):
- if 'list_notifier_drivers' in CONF:
- if ('openstack.common.notifier.log_notifier' in
- CONF.list_notifier_drivers):
- return
+ if ('openstack.common.notifier.log_notifier' in
+ CONF.notification_driver):
+ return
notifier.api.notify(None, 'error.publisher',
'error_notification',
notifier.api.ERROR,