roqua-support 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4788085a81572cc52f7a47204ee8a09b3b3f6f0
-  data.tar.gz: 79dbac1200543744c31be14fcf3a1917ad6f8bd3
+  metadata.gz: fdc528029ceea9027cdb56ce3299bc59a64817e4
+  data.tar.gz: b3eaa1c5921dd5684c595486580533d790a6dc5d
 SHA512:
-  metadata.gz: 83f0fa54714281bee536b2c060de57584dbd30d1abaaa012774460308fb66efffe256d2d7faf10f00ec9e4b21e90ac95fac7a2af54953bf8f71d63cfd54092ad
-  data.tar.gz: f4f248b249452af42275bfbdae0492951a8092e1e34e1c2ad40a02291a4a44d16a4618ac85264fcdeaf65b486b78abbf3ee3be9314785b433e11d21d8626d81a
+  metadata.gz: 2fb16cd904080b1b5e22ed7bd14afda38139ee53b34583967a55a1cd986a54fc4e621adeed1fb64b1ec434f63b5012dc7da3ec317202aac624dd69108945677a
+  data.tar.gz: c6c44518398a0e3a012bcfdcac524c9527de98183cb37930a7175e97e9fa51d59b7362e51309025b7e8579af37fd6fc54baf84df89713a33d2ddce08e45647d5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.16 / 2014-11-19
+
+* Add support for skipping the backtrace in the logs
+
 ## 0.1.15 / 2014-11-18
 
 * log Airbrake UUID when reporting exceptions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roqua-support (0.1.15)
+    roqua-support (0.1.16)
       activesupport (>= 3.2, < 5.0)
 
 GEM

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.1.15'
+    VERSION = '0.1.16'
   end
 end

data/lib/roqua/support/errors.rb

@@ -11,44 +11,45 @@ module Roqua
 
       def self.report(exception, context = {})
         return if const_defined?(:Rails) and Rails.env.test?
-        parameters, controller = merge_parameters(context)
+        parameters, controller, skip_backtrace = merge_parameters(context)
+        notification_urls = []
         # Notify Airbrake
-        airbrake_id = notify_airbrake(exception, controller, parameters)
+        notification_urls << notify_airbrake(exception, controller, parameters)
         # Notify AppSignal
-        notify_appsignal(exception, parameters)
+        notification_urls << notify_appsignal(exception, parameters)
         # Notify Roqua logging
-        log_exception(exception, parameters, airbrake_id)
+        log_exception(exception, parameters, notification_urls.compact, skip_backtrace)
       end
 
       private
 
       def self.merge_parameters(context)
         begin
-          if context.is_a?(Hash) && extra_parameters.is_a?(Hash)
+          if context.is_a?(Hash)
             controller = context.delete :controller
-            parameters = extra_parameters.merge(context)
-          elsif context.is_a?(Hash)
-            controller = context.delete :controller
-            parameters = context
+            skip_backtrace = context.delete :skip_backtrace
+            if extra_parameters.is_a?(Hash)
+              parameters = extra_parameters.merge(context)
+            else
+              parameters = context
+            end
           elsif extra_parameters.is_a?(Hash)
             parameters = extra_parameters
           end
-          [parameters, controller]
+          [parameters, controller, skip_backtrace]
         rescue Exception
         end
       end
 
-      def self.log_exception(exception, parameters = {}, airbrake_id = nil)
+      def self.log_exception(exception, parameters = {}, notification_urls = [], skip_backtrace = false)
         begin
           if Roqua.respond_to?(:logger)
             exception_info = {class_name: exception.class.to_s,
                               message: exception.message,
                               parameters: parameters}
-            if airbrake_id.present?
-              exception_info[:airbrake_notification] = "https://airbrake.io/locate/#{airbrake_id}"
-            else
-              exception_info[:backtrace] = exception.backtrace
-            end
+            exception_info[:notification_urls] = notification_urls if notification_urls.present?
+            exception_info[:backtrace] = exception.backtrace unless skip_backtrace
+            puts exception_info.inspect
             Roqua.logger.error('roqua.exception', exception_info)
           end
         rescue Exception
@@ -70,7 +71,8 @@ module Roqua
               end
             end
             request_data ||= {parameters: parameters}
-            Airbrake.notify_or_ignore(exception, request_data)
+            uuid = Airbrake.notify_or_ignore(exception, request_data)
+            "https://airbrake.io/locate/#{uuid}" if uuid
           end
         rescue Exception
         end

data/spec/roqua/support/errors_spec.rb

@@ -17,24 +17,45 @@ describe 'Error reporting' do
     Roqua.logger = logwrapper
   end
 
-  it 'sends notifications to the eventlog' do
-    Roqua.logger.should_receive(:error).with('roqua.exception',
-                                             class_name: 'Exception',
-                                             message: 'exception_message',
-                                             backtrace: ['back', 'trace', 'lines'],
-                                             parameters: {})
-    Roqua::Support::Errors.report exception
-  end
+  context 'when the Roqua logger is defined' do
+    it 'supports default extra params' do
+      Roqua::Support::Errors.stub(extra_parameters: {organization: 'some_org'})
+      Roqua.logger.should_receive(:error).with('roqua.exception',
+                                               class_name: 'Exception',
+                                               message: 'exception_message',
+                                               backtrace: ['back', 'trace', 'lines'],
+                                               parameters: {organization: 'some_org'})
+      Roqua::Support::Errors.report exception
+    end
+
+    it 'sends notifications to the eventlog' do
+      Roqua.logger.should_receive(:error).with('roqua.exception',
+                                               class_name: 'Exception',
+                                               message: 'exception_message',
+                                               backtrace: ['back', 'trace', 'lines'],
+                                               parameters: {})
+      Roqua::Support::Errors.report exception
+    end
 
-  it 'sends the airbrake notification id to the eventlog when present' do
-    stub_const('Airbrake', double('Airbrake', notify_or_ignore: 'airbrake_notification_uuid'))
-    Roqua.logger.should_receive(:error)
-                .with('roqua.exception',
-                      class_name: 'Exception',
-                      message: 'exception_message',
-                      airbrake_notification: 'https://airbrake.io/locate/airbrake_notification_uuid',
-                      parameters: {})
-    Roqua::Support::Errors.report exception
+    it 'skips the backtrace when the skip_backtrace flag is set' do
+      Roqua.logger.should_receive(:error).with('roqua.exception',
+                                               class_name: 'Exception',
+                                               message: 'exception_message',
+                                               parameters: {})
+      Roqua::Support::Errors.report exception, skip_backtrace: true
+    end
+
+    it 'logs notification_urls when present' do
+      stub_const('Airbrake', double('Airbrake', notify_or_ignore: 'uuid'))
+      Roqua.logger.should_receive(:error)
+                  .with('roqua.exception',
+                        class_name: 'Exception',
+                        message: 'exception_message',
+                        backtrace: ['back', 'trace', 'lines'],
+                        notification_urls: ['https://airbrake.io/locate/uuid'],
+                        parameters: {})
+      Roqua::Support::Errors.report exception
+    end
   end
 
   context 'when Airbrake is defined' do
@@ -101,14 +122,4 @@ describe 'Error reporting' do
       Roqua::Support::Errors.report exception
     end
   end
-
-  it 'supports default extra params' do
-    Roqua::Support::Errors.stub(extra_parameters: {organization: 'some_org'})
-    Roqua.logger.should_receive(:error).with('roqua.exception',
-                                             class_name: 'Exception',
-                                             message: 'exception_message',
-                                             backtrace: ['back', 'trace', 'lines'],
-                                             parameters: {organization: 'some_org'})
-    Roqua::Support::Errors.report exception
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport