From 2f94dda6ad2d57f418527fba47e8e38677e6a499 Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Tue, 9 Oct 2018 11:56:50 +0200
Subject: [PATCH] Use oslo_utils.encodeutils.safe_encode

Change-Id: I47e3a31c7415916450455df758238e473534e735
Story: 2000975
Task: 27002
---
 monasca_log_api/app/base/log_publisher.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/monasca_log_api/app/base/log_publisher.py b/monasca_log_api/app/base/log_publisher.py
index 25827bb6..3b483f1d 100644
--- a/monasca_log_api/app/base/log_publisher.py
+++ b/monasca_log_api/app/base/log_publisher.py
@@ -19,6 +19,7 @@ import falcon
 from monasca_common.kafka import producer
 from monasca_common.rest import utils as rest_utils
 from oslo_log import log
+from oslo_utils import encodeutils
 
 from monasca_log_api.app.base import model
 from monasca_log_api import conf
@@ -148,21 +149,7 @@ class LogPublisher(object):
         if not self._is_message_valid(message):
             raise InvalidMessageException()
         truncated = self._truncate(message)
-        proper = self._ensure_type_bytes(truncated)
-        return proper
-
-    def _ensure_type_bytes(self, message):
-        """Ensures that message will have proper type.
-
-        Kafka client expects that messages being
-        posted have certain data type (:py:func:`six.binary_type`).
-        This method ensures by the means of encoding that such type
-        will always be a case regardless if codebase runs under
-        :py:data:`six.PY2` or :py:data:`six.PY3`
-
-        """
-        message = message.encode('utf-8')
-        return message
+        return encodeutils.safe_encode(truncated, incoming='utf-8')
 
     def _truncate(self, envelope):
         """Truncates the message if needed.