Fix warnings and circular reference crash

Fixes #254
bugsnag · Nov 16, 2015 · a041d1f · a041d1f
2 parents 6348306 + 2f174b4
commit a041d1f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/lib/bugsnag/delivery/thread_queue.rb b/lib/bugsnag/delivery/thread_queue.rb
@@ -11,19 +11,17 @@ class << self
         def deliver(url, body, configuration)
           start_once!
 
-          if queue.length > MAX_OUTSTANDING_REQUESTS
-            Bugsnag.warn("Dropping notification, #{queue.length} outstanding requests")
+          if @queue.length > MAX_OUTSTANDING_REQUESTS
+            Bugsnag.warn("Dropping notification, #{@queue.length} outstanding requests")
             return
           end
 
           # Add delivery to the worker thread
-          queue.push proc { super(url, body, configuration) }
+          @queue.push proc { super(url, body, configuration) }
         end
 
         private
 
-        attr_reader :queue
-
         def start_once!
           MUTEX.synchronize do
             return if @started
@@ -32,15 +30,15 @@ def start_once!
             @queue = Queue.new
 
             worker_thread = Thread.new do
-              while x = queue.pop
+              while x = @queue.pop
                 break if x == STOP
                 x.call
               end
             end
 
             at_exit do
-              Bugsnag.warn("Waiting for #{queue.length} outstanding request(s)") unless queue.empty?
-              queue.push STOP
+              Bugsnag.warn("Waiting for #{@queue.length} outstanding request(s)") unless @queue.empty?
+              @queue.push STOP
               worker_thread.join
             end
           end

diff --git a/lib/bugsnag/deploy.rb b/lib/bugsnag/deploy.rb
@@ -1,4 +1,3 @@
-require "bugsnag"
 require "json"
 
 module Bugsnag

diff --git a/lib/bugsnag/notification.rb b/lib/bugsnag/notification.rb
@@ -30,7 +30,7 @@ class Notification
     CURRENT_PAYLOAD_VERSION = "2"
 
     attr_accessor :context
-    attr_accessor :user
+    attr_reader :user
     attr_accessor :configuration
     attr_accessor :meta_data
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -27,12 +27,12 @@ def notify_test_exception(*args)
     WebMock.stub_request(:post, "https://notify.bugsnag.com/")
 
     Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
-    Bugsnag.configure do |config|
-      config.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
-      config.release_stage = "production"
-      config.delivery_method = :synchronous
+    Bugsnag.configure do |bugsnag|
+      bugsnag.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
+      bugsnag.release_stage = "production"
+      bugsnag.delivery_method = :synchronous
       # silence logger in tests
-      config.logger = Logger.new(StringIO.new)
+      bugsnag.logger = Logger.new(StringIO.new)
     end
   end