From f181ece2fd1e0cb90b0453fea2a6c5fcf5d4b82d Mon Sep 17 00:00:00 2001
From: Brian Cline <bcline@softlayer.com>
Date: Fri, 25 Oct 2013 11:32:30 -0500
Subject: [PATCH] Sync log_handler from Oslo

Resolves an ImportError when enabling publish_errors for
Ceilometer services. Essentially, PublishErrorsHandler was
moved in Oslo from *.log to *.log_handler, but log_handler
was not yet being pulled in.

Oslo commit: Ibf28ba17f81b5ddeda653f6a3501ecac18ffcd42

Change-Id: I23bc7fd0ea4c811e133e743634032fb836c34b22
Fixes: Bug #1244722
---
 ceilometer/openstack/common/log_handler.py | 31 ++++++++++++++++++++++
 openstack-common.conf                      |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 ceilometer/openstack/common/log_handler.py

diff --git a/ceilometer/openstack/common/log_handler.py b/ceilometer/openstack/common/log_handler.py
new file mode 100644
index 000000000..09fb4fb85
--- /dev/null
+++ b/ceilometer/openstack/common/log_handler.py
@@ -0,0 +1,31 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 SoftLayer Technologies, an IBM Company
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+import logging
+
+from nova.openstack.common import notifier
+
+from oslo.config import cfg
+
+
+class PublishErrorsHandler(logging.Handler):
+    def emit(self, record):
+        if ('ceilometer.openstack.common.notifier.log_notifier' in
+                cfg.CONF.notification_driver):
+            return
+        notifier.api.notify(None, 'error.publisher',
+                            'error_notification',
+                            notifier.api.ERROR,
+                            dict(error=record.msg))
diff --git a/openstack-common.conf b/openstack-common.conf
index feddc54d7..ec60ca0a3 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -11,6 +11,7 @@ module=importutils
 module=jsonutils
 module=local
 module=log
+module=log_handler
 module=loopingcall
 module=middleware
 module=network_utils