lib/alephant/publisher/queue/sqs_helper/archiver.rb in alephant-publisher-queue-1.4.1 vs lib/alephant/publisher/queue/sqs_helper/archiver.rb in alephant-publisher-queue-2.0.0

@@ -37,12 +37,17 @@
             logger.metric "SynchronouslyArchivedData"
             store message
           end
 
           def store(message)
-            logger.info log_message(message)
-            store_item message
+            store_item(message).tap do
+              logger.info(
+                "event"       => "MessageStored",
+                "messageBody" => body_for(message),
+                "method"      => "#{self.class}#store"
+              )
+            end
           end
 
           def store_item(message)
             cache.put(
               cache_key(message.id),
@@ -60,17 +65,11 @@
               "#{self.class}#store:",
               "'#archive/#{date_key}/#{id}'"
             ]
           end
 
-          def log_message(m)
-            log_message_parts(m.id).tap do |parts|
-              parts << "(#{encoded_body m.body})" if log_message_body
-            end.join(" ")
-          end
-
-          def encoded_body(message)
-            JSON.generate message.split("\n")
+          def body_for(message)
+             log_message_body ? message.body : "No message body available"
           end
 
           def date_key
             DateTime.now.strftime("%d-%m-%Y_%H")
           end