bugsnag 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdbdd74cc3bf6c45f80a0828c67de91915375114
-  data.tar.gz: fe23fc1d6931f33c1f120042168fd3f59d41bc24
+  metadata.gz: 43df7800cf5b29766a8eb2ee1574eea6549f9e0a
+  data.tar.gz: 6c9478cd0c3dcf185b30e6266fbbe7bffc1ab26d
 SHA512:
-  metadata.gz: b54f5a14ae6d88f0ad19084d6d6e84f0ebaf6463ab503d603394ac69f9eb152a36a8b71bbd75de2ff773a38c29f1e2b845adf600952b776a2668218c801f3e35
-  data.tar.gz: 309b32904d8372069fd02a446689c0fe1212a9f6e1f8db0ae4e8b9a9728783e8ffcd2bf55e60cded72acaffe59965209a18c7e752603353deef37a9928b7e171
+  metadata.gz: e961861ba8a71814253994d8c011166fa2b95c3c086ab795aa6ee4a0086f6affb09655426256684ccd0010033f3df1f32ef38353e49cfd693ef4b86c66e04849
+  data.tar.gz: ca3916340b2c8d937481204bf36f1f6b523d0ebaf30ab48e1440107ba36d83dbbe9c35670bb1341bd95dce1f656cd2451fd7a05ff4f7eaa434d9ce074ddddd7a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+2.8.2
+-----
+-   Fix various threading issues during library initialization
+
 2.8.1
 -----
 -   Exclude cookies and authorization headers by default

data/VERSION

@@ -1 +1 @@
-2.8.1
+2.8.2

data/lib/bugsnag.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "thread"
 
 require "bugsnag/version"
 require "bugsnag/configuration"
@@ -25,6 +26,7 @@ require "bugsnag/middleware/callbacks"
 
 module Bugsnag
   LOG_PREFIX = "** [Bugsnag] "
+  LOCK = Mutex.new
 
   class << self
     # Configure the Bugsnag notifier application-wide settings.
@@ -92,7 +94,7 @@ module Bugsnag
 
     # Configuration getters
     def configuration
-      @configuration ||= Bugsnag::Configuration.new
+      @configuration || LOCK.synchronize { @configuration ||= Bugsnag::Configuration.new }
     end
 
     # Set "per-request" data, temporal data for use in bugsnag middleware

data/lib/bugsnag/delivery/thread_queue.rb

@@ -6,6 +6,7 @@ module Bugsnag
       MAX_OUTSTANDING_REQUESTS = 100
       STOP = Object.new
 
+
       class << self
         def deliver(url, body, configuration)
           if queue.length > MAX_OUTSTANDING_REQUESTS
@@ -15,35 +16,32 @@ module Bugsnag
 
           # Add delivery to the worker thread
           queue.push proc { super(url, body, configuration) }
-
-          # Make sure the worker thread is started
-          ensure_worker_thread_started
         end
 
         private
-        def queue
-          @queue ||= Queue.new
-        end
 
-        def ensure_worker_thread_started
-          unless @worker_thread
-            @worker_thread = Thread.new do
-              while x = queue.pop
-                break if x == STOP
-                x.call
-              end
-            end
+        attr_reader :queue
 
-            at_exit do
-              Bugsnag.warn("Waiting for #{queue.length} outstanding request(s)") unless queue.empty?
-              queue.push STOP
-              @worker_thread.join
+        def start!
+          @queue = Queue.new
+
+          worker_thread = Thread.new do
+            while x = queue.pop
+              break if x == STOP
+              x.call
             end
           end
 
-          @worker_thread
+          at_exit do
+            Bugsnag.warn("Waiting for #{queue.length} outstanding request(s)") unless queue.empty?
+            queue.push STOP
+            worker_thread.join
+          end
         end
       end
+
+      # do this once at require time to avoid race conditions
+      start!
     end
   end
 end

data/lib/bugsnag/helpers.rb

@@ -41,7 +41,7 @@ module Bugsnag
         if str =~ /#<.*>/
           '[OBJECT]'
         else
-          str
+          cleanup_string(str)
         end
       end
     end

data/lib/bugsnag/middleware_stack.rb

@@ -3,46 +3,58 @@ module Bugsnag
     def initialize
       @middlewares = []
       @disabled_middleware = []
+      @mutex = Mutex.new
     end
 
     def use(new_middleware)
-      return if @disabled_middleware.include?(new_middleware)
+      @mutex.synchronize do
+        return if @disabled_middleware.include?(new_middleware)
+        return if @middlewares.include?(new_middleware)
 
-      @middlewares << new_middleware
+        @middlewares << new_middleware
+      end
     end
 
     def insert_after(after, new_middleware)
-      return if @disabled_middleware.include?(new_middleware)
-
-      if after.is_a? Array
-        index = @middlewares.rindex {|el| after.include?(el)}
-      else
-        index = @middlewares.rindex(after)
-      end
-
-      if index.nil?
-        @middlewares << new_middleware
-      else
-        @middlewares.insert index + 1, new_middleware
+      @mutex.synchronize do
+        return if @disabled_middleware.include?(new_middleware)
+        return if @middlewares.include?(new_middleware)
+
+        if after.is_a? Array
+          index = @middlewares.rindex {|el| after.include?(el)}
+        else
+          index = @middlewares.rindex(after)
+        end
+
+        if index.nil?
+          @middlewares << new_middleware
+        else
+          @middlewares.insert index + 1, new_middleware
+        end
       end
     end
 
     def insert_before(before, new_middleware)
-      return if @disabled_middleware.include?(new_middleware)
+      @mutex.synchronize do
+        return if @disabled_middleware.include?(new_middleware)
+        return if @middlewares.include?(new_middleware)
 
-      if before.is_a? Array
-        index = @middlewares.index {|el| before.include?(el)}
-      else
-        index = @middlewares.index(before)
-      end
+        if before.is_a? Array
+          index = @middlewares.index {|el| before.include?(el)}
+        else
+          index = @middlewares.index(before)
+        end
 
-      @middlewares.insert index || @middlewares.length, new_middleware
+        @middlewares.insert index || @middlewares.length, new_middleware
+      end
     end
 
     def disable(*middlewares)
-      @disabled_middleware += middlewares
+      @mutex.synchronize do
+        @disabled_middleware += middlewares
 
-      @middlewares.delete_if {|m| @disabled_middleware.include?(m)}
+        @middlewares.delete_if {|m| @disabled_middleware.include?(m)}
+      end
     end
 
     # This allows people to proxy methods to the array if they want to do more complex stuff
@@ -56,7 +68,7 @@ module Bugsnag
       lambda_has_run = false
       notify_lambda = lambda do |notif|
         lambda_has_run = true
-        yield
+        yield if block_given?
       end
 
       begin

data/lib/bugsnag/notification.rb

@@ -191,7 +191,7 @@ module Bugsnag
       # Warn if no release_stage is set
       Bugsnag.warn "You should set your app's release_stage (see https://bugsnag.com/docs/notifiers/ruby#release_stage)." unless @configuration.release_stage
 
-      @configuration.internal_middleware.run(self) { }
+      @configuration.internal_middleware.run(self)
 
       exceptions.each do |exception|
         if exception.class.include?(Bugsnag::MetaData)
@@ -224,46 +224,49 @@ module Bugsnag
         endpoint = (@configuration.use_ssl ? "https://" : "http://") + @configuration.endpoint
         Bugsnag.log("Notifying #{endpoint} of #{@exceptions.last.class} from api_key #{api_key}")
 
-        # Build the payload's exception event
-        payload_event = {
-          :app => {
-            :version => @configuration.app_version,
-            :releaseStage => @configuration.release_stage,
-            :type => @configuration.app_type
-          },
-          :context => self.context,
-          :user => @user,
-          :payloadVersion => payload_version,
-          :exceptions => exception_list,
-          :severity => self.severity,
-          :groupingHash => self.grouping_hash,
-        }
-
-        payload_event[:device] = {:hostname => @configuration.hostname} if @configuration.hostname
-
-        # cleanup character encodings
-        payload_event = Bugsnag::Helpers.cleanup_obj_encoding(payload_event)
-
-        # filter out sensitive values in (and cleanup encodings) metaData
-        payload_event[:metaData] = Bugsnag::Helpers.cleanup_obj(@meta_data, @configuration.params_filters)
-        payload_event.reject! {|k,v| v.nil? }
-
-        # Build the payload hash
-        payload = {
-          :apiKey => api_key,
-          :notifier => {
-            :name => NOTIFIER_NAME,
-            :version => NOTIFIER_VERSION,
-            :url => NOTIFIER_URL
-          },
-          :events => [payload_event]
-        }
-
         # Deliver the payload
-        self.class.deliver_exception_payload(endpoint, payload, @configuration, @delivery_method)
+        self.class.deliver_exception_payload(endpoint, build_exception_payload, @configuration, @delivery_method)
       end
     end
 
+    # Build an exception payload
+    def build_exception_payload
+      # Build the payload's exception event
+      payload_event = {
+        :app => {
+          :version => @configuration.app_version,
+          :releaseStage => @configuration.release_stage,
+          :type => @configuration.app_type
+        },
+        :context => self.context,
+        :user => @user,
+        :payloadVersion => payload_version,
+        :exceptions => exception_list,
+        :severity => self.severity,
+        :groupingHash => self.grouping_hash,
+      }
+
+      payload_event[:device] = {:hostname => @configuration.hostname} if @configuration.hostname
+
+      # cleanup character encodings
+      payload_event = Bugsnag::Helpers.cleanup_obj_encoding(payload_event)
+
+      # filter out sensitive values in (and cleanup encodings) metaData
+      payload_event[:metaData] = Bugsnag::Helpers.cleanup_obj(@meta_data, @configuration.params_filters)
+      payload_event.reject! {|k,v| v.nil? }
+
+      # return the payload hash
+      {
+        :apiKey => api_key,
+        :notifier => {
+          :name => NOTIFIER_NAME,
+          :version => NOTIFIER_VERSION,
+          :url => NOTIFIER_URL
+        },
+        :events => [payload_event]
+      }
+    end
+
     def ignore?
       @should_ignore || ignore_exception_class? || ignore_user_agent?
     end
@@ -411,6 +414,9 @@ module Bugsnag
 
       from_line = [line_number - num_lines, 1].max
 
+      # don't try and open '(irb)' or '-e'
+      return unless File.exist?(file)
+
       # Populate code hash with line numbers and code lines
       File.open(file) do |f|
         current_line_number = 0

data/spec/helper_spec.rb

@@ -44,6 +44,17 @@ describe Bugsnag::Helpers do
     end
   end
 
+  it "cleans up strings returned from #to_s properly" do
+    if RUBY_VERSION > "1.9"
+      str = "Andr\xc7\xff"
+      if str.respond_to? :force_encoding
+        str = str.force_encoding('BINARY')
+      end
+      obj = RuntimeError.new(str)
+      expect(Bugsnag::Helpers.cleanup_obj(obj)).to eq("Andr��")
+    end
+  end
+
   it "filters by string inclusion" do
     expect(Bugsnag::Helpers.cleanup_obj({ :foo => 'bar' }, ['f'])).to eq({ :foo => '[FILTERED]' })
     expect(Bugsnag::Helpers.cleanup_obj({ :foo => 'bar' }, ['b'])).to eq({ :foo => 'bar' })

data/spec/integration_spec.rb

@@ -55,6 +55,19 @@ describe 'Bugsnag' do
     expect(request['appVersion']).to eq('1.1.1')
   end
 
+  it 'should work with threadpool delivery' do
+    Bugsnag.configure do |config|
+      config.endpoint = "localhost:#{server.config[:Port]}"
+      config.use_ssl = false
+      config.delivery_method = :thread_queue
+    end
+    WebMock.allow_net_connect!
+
+    Bugsnag.notify 'yo'
+
+    expect(request['events'][0]['exceptions'][0]['message']).to eq('yo')
+  end
+
   describe 'with a proxy' do
     proxy = nil
     pqueue = Queue.new

data/spec/rack_spec.rb

@@ -42,4 +42,15 @@ describe Bugsnag::Rack do
       expect(Bugsnag::Notification).not_to have_sent_notification
     end
   end
+
+  it "don't mess with middlewares list on each req" do
+    stub_const('Rack', nil)
+    app = lambda { |env| ['200', {}, ['']] }
+
+    Bugsnag::Rack.new(app)
+
+    expect { 2.times { Bugsnag::Rack.new(app) } }.not_to change {
+      Bugsnag.configuration.middleware.instance_variable_get(:@middlewares)
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json