Fix formatting

Author: dubee

provider/consumer.py

@@ -463,7 +463,7 @@ def __fireTrigger(self, messages):
     # return the dict that will be sent as the trigger payload
     def __getMessagePayload(self, message):
         return {
-            'value': self.__encodeMessageIfNeeded(message.value()),
+            'value': self.encodeMessageIfNeeded(message.value()),
             'topic': message.topic(),
             'partition': message.partition(),
             'offset': message.offset(),
@@ -501,8 +501,8 @@ def __getUTF8Encoding(self, value):
         return value
 
 
-def __encodeMessageIfNeeded(self, value):
-        value = self.__getUTF8Encoding(value)
+    def __encodeMessageIfNeeded(self, value):
+        value = self.getUTF8Encoding(value)
 
         if self.encodeValueAsJSON:
             try:
@@ -512,8 +512,8 @@ def __encodeMessageIfNeeded(self, value):
             except ValueError as e:
                 # message is not a JSON object, return the message as a JSON value
                 logging.warn('[{}] I was asked to encode a message as JSON, but I failed with "{}".'.format(self.trigger, e))
-                value = self.__getUTF8Encoding("\"{}\"".format(value))
-                pass
+                value = "\"{}\"".format(value)
+                return value
         elif self.encodeValueAsBase64:
             try:
                 parsed = value.encode("base64").strip()
@@ -536,6 +536,8 @@ def __encodeKeyIfNeeded(self, key):
                 logging.warn('[{}] Unable to encode a binary key.'.format(self.trigger))
                 pass
 
+        key = self.getUTF8Encoding(key)
+
         logging.debug('[{}] Returning un-encoded message'.format(self.trigger))
         return key