appsignal 1.0.2.beta.3 → 1.0.2.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a01467c85c347db2cbbc1eb55f4524d7b3538dd
-  data.tar.gz: 9f95f2f8bacb616e584576aa3040e4f2bd0965ac
+  metadata.gz: f93d8352dc9721ce4904f6babf14d2f373aa60f0
+  data.tar.gz: ad56ad53fe82568d2f560bbe7a9e0a1e1ef25314
 SHA512:
-  metadata.gz: ada7231ed4c993cf94202aaab459bfca8fca6e0c4e50fdfcc77ccb8e50204e1e71648d77fed727fcccfdc57c848c925b099865de1892829972e160834911aaee
-  data.tar.gz: 9bbbbf3c540af6645e0cca554d51e0f62e1fc2b3382f63c0a11c8fb22ff12a231b669ff25593bb601b91f03c588a3f1fb583188591be482d48913871783efbc0
+  metadata.gz: bf30299ffd79ca086305ad588a15094d039f23e481857dd0b5203d39ec517c6a29bd783489f974cca210b35ab40c910416ff07a8694795203293566649311765
+  data.tar.gz: c70e9386856293f12fa00ae9858c96df46cc054f4e0ffa60e6ff1b78b05c92166b4987f86a81af1bf868764c9290f85610ac2b1060a005463cb0edfaba289a99

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 * Rake integration file for backwards compatibility
 * Don't instrument mongo-ruby-driver when transaction is not present
 * Accept method calls on extension if it's not loaded
+* Fix for duplicate notifications subscriptions when forking
 
 # 1.0.1
 * Fix for bug in gem initialization when using `safe_yaml` gem

data/lib/appsignal/subscriber.rb

@@ -2,6 +2,8 @@ module Appsignal
   class Subscriber
     BLANK = ''.freeze
 
+    attr_reader :as_subscriber
+
     def initialize
       subscribe
     end
@@ -9,12 +11,15 @@ module Appsignal
     def subscribe
       Appsignal.logger.debug('Subscribing to notifications')
       # Subscribe to notifications that don't start with a !
-      ActiveSupport::Notifications.subscribe(/^[^!]/, self)
+      @as_subscriber = ActiveSupport::Notifications.subscribe(/^[^!]/, self)
     end
 
     def unsubscribe
-      Appsignal.logger.debug('Unsubscribing from notifications')
-      ActiveSupport::Notifications.unsubscribe(self)
+      if @as_subscriber
+        Appsignal.logger.debug('Unsubscribing from notifications')
+        ActiveSupport::Notifications.unsubscribe(@as_subscriber)
+        @as_subscriber = nil
+      end
     end
 
     def resubscribe

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.0.2.beta.3'
+  VERSION = '1.0.2.beta.4'
 end

data/spec/lib/appsignal/subscriber_spec.rb

@@ -6,43 +6,56 @@ describe Appsignal::Subscriber do
   end
 
   before do
+    ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).clear
     Thread.current[:appsignal_transaction] = nil
   end
 
-  let(:subscriber) { Appsignal.subscriber }
+  let(:subscriber) { Appsignal::Subscriber.new }
   subject { subscriber }
 
   context "initialization" do
+    before do
+      subject
+    end
+
     it "should be in the subscriber list" do
       ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
         s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
-      end.count == 1
+      end.count.should == 1
     end
   end
 
   context "subscriptions" do
     describe "subscribe" do
       it "should subscribe" do
-        ActiveSupport::Notifications.should_receive(:subscribe).with(/^[^!]/, subject).at_least(:once)
-
         subject.subscribe
+        subject.as_subscriber.should_not be_nil
+
+        ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
+          s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
+        end.count.should == 2
       end
     end
 
     describe "#unsubscribe" do
       it "should unsubscribe" do
-        ActiveSupport::Notifications.should_receive(:unsubscribe).with(subject).at_least(:once)
-
         subject.unsubscribe
+        subject.as_subscriber.should be_nil
+
+        ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
+          s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
+        end.count.should == 0
       end
     end
 
     describe "#resubscribe" do
       it "should unsubscribe and subscribe" do
-        subject.should_receive(:unsubscribe).at_least(:once)
-        subject.should_receive(:subscribe)
-
         subject.resubscribe
+        subject.as_subscriber.should_not be_nil
+
+        ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
+          s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
+        end.count.should == 1
       end
     end
   end
@@ -56,6 +69,10 @@ describe Appsignal::Subscriber do
   end
 
   context "handling events using #start and #finish" do
+    before do
+      subscriber
+    end
+
     it "should should not listen to events that start with a bang" do
       subject.should_not_receive(:start)
       subject.should_not_receive(:finish)
@@ -97,20 +114,20 @@ describe Appsignal::Subscriber do
       end
 
       it "should call finish with title and body if there is a formatter" do
-          Appsignal::Extension.should_receive(:start_event).once
-          Appsignal::Extension.should_receive(:finish_event).with(
-            kind_of(Integer),
-            'request.net_http',
-            'GET http://www.google.com',
-            ''
-          ).once
-
-          ActiveSupport::Notifications.instrument(
-            'request.net_http',
-            :protocol => 'http',
-            :domain   => 'www.google.com',
-            :method   => 'GET'
-          )
+        Appsignal::Extension.should_receive(:start_event).once
+        Appsignal::Extension.should_receive(:finish_event).with(
+          kind_of(Integer),
+          'request.net_http',
+          'GET http://www.google.com',
+          ''
+        ).once
+
+        ActiveSupport::Notifications.instrument(
+          'request.net_http',
+          :protocol => 'http',
+          :domain   => 'www.google.com',
+          :method   => 'GET'
+        )
       end
 
       context "when paused" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.0.2.beta.3
+  version: 1.0.2.beta.4
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack