banter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d85903bb31f3228276c85be5bafef8248ce7d59
-  data.tar.gz: b0360f892d785b4f43cd1edea68a2dd46770a183
+  metadata.gz: 42627fddd3d122f765afe2aef89821602043ba0d
+  data.tar.gz: c665d387761aa6a52af05a4e55e08ff35f794cf4
 SHA512:
-  metadata.gz: 35b341cecc7fc70ded556ccdd4fc982e10a287d792e98806124b62a6cd12cad61be3e77510f8aee20244578705b0d8407ddb08272333a2a638e7dd9f98cc16d8
-  data.tar.gz: 45116f712ef2bb23029c23ad55ac820a942230602500439f069240eb2499c15143a05ed06e9e8ad4f6ccd575ed4da11334ab46ffae6547bf5c118e973f7bf9a4
+  metadata.gz: 3b5e5f28f78eecfed934806260c4eda7231e338deb826132a0ba752c7c3238f6dd05693a884df0ac059552d765b80d910b8fc669464fd4a1213751d8321433c2
+  data.tar.gz: d33a2b58e7da306eebcb9424a3581834a3eca0b03a4711132fc32fcceec57a2b6fbe30c71b5726e4eaa39bd9551458b945bcf4dfee5933b0403cc88dd8b67514

data/lib/banter/server/client_queue_listener.rb

@@ -38,7 +38,7 @@ module Banter
         worker.perform!(payload)
         track_message_successful
       rescue ::Banter::PayloadValidationError => banter_error
-        track_message_failed(banter_error.message, false)
+        track_message_failed(banter_error, false)
         Banter::RabbitLogger.log(::Logger::ERROR, { worker: worker_class.name, message: banter_error.message, envelope: envelope })
         Airbrake.notify("Validation error for #{worker_class.name}",
                         params: {
@@ -47,7 +47,7 @@ module Banter
                           context:    envelope[:context],
                           payload:    envelope[:payload] })
       rescue => e
-        track_message_failed(e.message, true)
+        track_message_failed(e, true)
         Banter::RabbitLogger.log(::Logger::DEBUG, "Failed message for #{worker_class.name} #{e.message}")
         Airbrake.notify("Failed perform for #{worker_class.name}",
                         params: {
@@ -65,10 +65,10 @@ module Banter
         BanterMessage.message_successful
       end
 
-      def track_message_failed(error_message, error = true)
+      def track_message_failed(error, errored = true)
         return unless Banter::Configuration.web_enabled
-        status = error ? BanterMessage::STATUS_ERROR : BanterMessage::STATUS_VALIDATION_FAILED
-        BanterMessage.message_failed(error_message, status)
+        status = errored ? BanterMessage::STATUS_ERROR : BanterMessage::STATUS_VALIDATION_FAILED
+        BanterMessage.message_failed(error, status)
       end
 
       def track_message_received(worker, payload)

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/banter/web/models/banter_message.rb

@@ -13,6 +13,7 @@ class BanterMessage
   field :done_at, type: Time
   field :status, type: String
   field :error_message, type: String
+  field :error_backtrace
   field :worker_id
   field :progress_at, type: Integer
   field :progress_total, type: Integer
@@ -71,10 +72,11 @@ class BanterMessage
   # Records the current message as errored or validation failed with error message. Clears the BanterMessage.current
   # @param [String] error_message
   # @param [String] status
-  def self.message_failed(error_message, status)
-    current.status        = status
-    current.done_at       = Time.now
-    current.error_message = error_message
+  def self.message_failed(error, status)
+    current.status          = status
+    current.done_at         = Time.now
+    current.error_message   = error.message
+    current.error_backtrace = error.backtrace
     current.save!
     BanterWorker.clear_current_message!(false)
     @@current = nil

data/lib/banter/web/serializers/banter_message_serializer.rb

@@ -22,6 +22,7 @@ module Banter
             done_at:          message.done_at,
             status:           message.status,
             error_message:    message.error_message,
+            error_backtrace:  message.error_backtrace,
             worker_id:        message.worker_id,
             progress_total:   message.progress_total,
             progress_at:      message.progress_at,

data/spec/banter/server/client_queue_listener_spec.rb

@@ -29,7 +29,13 @@ describe Banter::Server::ClientQueueListener do
       it { expect(banter_message.done_at.to_s).to eq(Time.now.to_s) }
       it { expect(banter_message.worker_id).to eq(BanterWorker.current.id) }
       it { expect(banter_message.status).to eq(status) }
-      it { expect(banter_message.error_message).to eq(error_message) }
+      if error_message
+        it { expect(banter_message.error_message).to eq(error_message) }
+        it { expect(banter_message.error_backtrace).not_to be_blank }
+      else
+        it { expect(banter_message.error_message).to be_nil }
+        it { expect(banter_message.error_backtrace).to be_nil }
+      end
     end
 
     before do

data/web/assets/javascripts/dashboard_app/controllers/message_controller.coffee

@@ -1,6 +1,7 @@
 angular.module('dashboardApp').controller 'messageController', ($scope, $rootScope, $http, $routeParams, $timeout, message, messagesService, commonMethodsService, messageMethodsService) ->
   commonMethodsService.setup($scope)
   messageMethodsService.setup($scope)
+  $scope.showBacktrace = false
   $scope.message = message
 
   $rootScope.$on 'start-messageController', ->

data/web/views/_message.haml

@@ -36,6 +36,21 @@
     .col-sm-3.bold Payload
     .col-sm-9
       %pre{data: { 'pretty-json' => 'message.payload'}}
+
+  %li.list-group-item.row{data: { 'ng-if' => 'message.error_message'}}
+    .col-sm-3.bold Error Message
+    .col-sm-9 {{ message.error_message }}
+
+  %li.list-group-item.row{data: { 'ng-if' => 'message.error_backtrace'}}
+    .col-sm-3.bold Error Backtrace
+    .col-sm-9
+      %a{data: { 'ng-click' => "showBacktrace = !showBacktrace"}}
+        %span{data: { 'ng-show' => 'showBacktrace' }} Hide Backtrace
+        %span{data: { 'ng-show' => '!showBacktrace' }} Show Backtrace
+      %div{data: { 'ng-if' => 'showBacktrace'}}
+        %p{data: { 'ng-repeat' => "bt in message.error_backtrace track by $index"}}
+          {{ bt }}
+
   %li.list-group-item.row{data: {'ng-show' => 'message.progress || message.progress_at || message.progress_total'}}
     .col-sm-3.bold Progress
     .col-sm-9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - The Honest Company