lib/dispatch-rider/logging/text_formatter.rb in dispatch-rider-1.6.1 vs lib/dispatch-rider/logging/text_formatter.rb in dispatch-rider-1.6.2

@@ -1,48 +1,48 @@
 # Text Log Formatter
 module DispatchRider
   module Logging
-    class TextFormatter < BaseFormatter
-      # @param [DispatchRider::QueueServices::ReceivedMessage] message
-      # @param [Exception] exception
-      # @return [String] log item
-      def format_error_handler_fail(message, exception)
-        "Failed error handling of: #{exception_info_fragment(message, exception)}"
-      end
+    class TextFormatter
 
-      # @param [DispatchRider::QueueServices::ReceivedMessage] message
-      # @param [String] reason
-      # @return [String] log item
-      def format_got_stop(message, reason)
-        "Got stop #{reason ? '(' + reason + ') ' : ' ' }while executing: #{message_info_fragment(message)}"
-      end
-
-      # @param [Symbol] kind of log action. one of: :start, :success, :fail, :complete
-      # @param [DispatchRider::QueueServices::ReceivedMessage] message
-      # @param [Exception] exception
-      # @param [Float] Job execution duration
-      # @return [String] log item
-      def format_handling(kind, message, exception: nil, duration: nil)
-        case kind
+      def format(data)
+        case data[:phase]
+        when :complete
+          "Completed execution of: #{message_info_fragment(data)} in #{format_duration(data[:duration])} seconds"
+        when :fail
+          "Failed execution of: #{exception_info_fragment(data)}"
         when :start
-          "Starting execution of: #{message_info_fragment(message)}"
+          "Starting execution of: #{message_info_fragment(data)}"
         when :success
-          "Succeeded execution of: #{message_info_fragment(message)}"
-        when :fail
-          "Failed execution of: #{exception_info_fragment(message, exception)}"
-        when :complete
-          "Completed execution of: #{message_info_fragment(message)} in #{format_duration(duration)} seconds"
+          "Succeeded execution of: #{message_info_fragment(data)}"
+        when :stop
+          "Got stop #{data[:reason] ? '(' + data[:reason] + ')' : '' } while executing: #{message_info_fragment(data)}"
+        when :error_handler_fail
+          "Failed error handling of: #{exception_info_fragment(data)}"
+        else
+          raise ArgumentError, "Invalid phase : #{data[:phase].inspect}"
         end
       end
 
       private
 
-      def message_info_fragment(message)
-        "(#{message.guid}): #{message.subject} : #{message_info_arguments(message).inspect}"
+      def message_info_fragment(data)
+        "(#{data[:guid]}): #{data[:subject]} : #{message_info_arguments(data[:body]).inspect}"
       end
 
-      def exception_info_fragment(message, exception)
-        "(#{message.guid}): #{message.subject} with #{exception.class}: #{exception.message}"
+      def exception_info_fragment(data)
+        "(#{data[:guid]}): #{data[:subject]} with #{data[:exception][:class]}: #{data[:exception][:message]}"
       end
+
+      def message_info_arguments(body)
+        body.dup.tap do |m|
+          m.delete('guid')
+          m.delete('object_id')
+        end
+      end
+
+      def format_duration(duration)
+        '%.2f' % [duration]
+      end
+
     end
   end
 end