appsignal 0.8.2 → 0.8.3.beta.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmFjYTM5Y2QzMmQwOWUwNWU4NDY0YzViZmM4NWIzNTlmMTFmMWY5Nw==
+    YjI5MDhiMzVjMGUyYzUyNWViOTkzYTQ2YmIzYWU1YjVmNGVjOGU5Nw==
   data.tar.gz: !binary |-
-    OWUxNDdlYTM5NTdkYmFhOTQ3NzViNWVjYWFmNTRlMDUxMGIzYmNiMQ==
+    OWVhNmFiZTFkMjkzOWZlNjg5MDY4ZmNiYWJhN2UzZGY3OTQzMDQ3Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWUwZGI2ZmUyODRhZDBlOTBmYzU1ZTQzMDM3YTNiN2M2NmRmMzk1MzUxYzRl
-    OWQ5MDU0Nzg4ZjQzZDc3YmQwOTMzNTU2NmVjMTdlYzg4NzgyYjA5MmIyZDk4
-    ZmJlMmQxNWUxMzBiOTdjY2I4YmNkM2FhMDE4OTkxMDAyN2JkZmI=
+    NzZiZDQ1YzcwZDk1NjkxYWVjMGFhMDFiNzBmYWVhNjZmMzU0MWI1ZTgzMDRh
+    OGIyN2NhNDRiNDgyYTkzM2RlNTI4MzVmYmRlMDg1NWM0ZDRkYzE5NjM4YmIw
+    N2U5NjFkOTNhMDQ0ZDkyNDkyNTc3MGNjZmM0MTg4NTFlMDhiODk=
   data.tar.gz: !binary |-
-    M2I3ZTM2MzMyMzkxMWFlY2RkODMxOWQ0ZmVjZjg4NTU2ZDI0YzU4NWRkMDYw
-    MTI0MjkyMDY1MWI3MDZkNzAzODI1ZmFkODExMDg3YTk2NzU2ZjE1NzAyYTJk
-    YmY1OTc3ODRlOThiMjQ3YTYxNmUxZjdhNDBmMzI0N2E4NzU2Mzg=
+    MTAzNDY1NjY1ZDRjYjg3OTNmMjVlZWJhODQ2Njg0MjUwMTRjMWIyNWVhNTQy
+    Y2Q0NzZlMTdkMWQ5YzdhYjVhYmViN2QwOGM5ZWI2YmZlNzljYjBhYTc3MTVj
+    YTllZmMxNTNjYTIxOWYxZWQ1Yjc3NDc4Njg3NzQ3YTEzMzI5MDI=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.8.3
+* Restart thread when we've been forked
+
 # 0.8.2
 * Bugfix in Delayed Job integration
 * appsignal prefix when logging to stdout

data/lib/appsignal/agent.rb

@@ -2,7 +2,8 @@ module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
 
-    attr_accessor :aggregator, :thread, :active, :sleep_time, :transmitter, :subscriber
+    attr_accessor :aggregator, :thread, :master_pid, :pid, :active, :sleep_time,
+                  :transmitter, :subscriber
 
     def initialize
       return unless Appsignal.active?
@@ -11,6 +12,8 @@ module Appsignal
       else
         @sleep_time = 60.0
       end
+      @master_pid = Process.pid
+      @pid = @master_pid
       @aggregator = Aggregator.new
       @transmitter = Transmitter.new(ACTION)
       subscribe
@@ -56,6 +59,7 @@ module Appsignal
     def enqueue(transaction)
       Appsignal.logger.debug('Enqueueing transaction')
       aggregator.add(transaction)
+      forked! if @pid != Process.pid
     end
 
     def send_queue
@@ -89,17 +93,13 @@ module Appsignal
 
     def forked!
       Appsignal.logger.debug('Forked worker process')
-      @forked = true
+      @pid = Process.pid
       Thread.exclusive do
         @aggregator = Aggregator.new
       end
       restart_thread
     end
 
-    def forked?
-      @forked ||= false
-    end
-
     def shutdown(send_current_queue=false)
       Appsignal.logger.info('Shutting down agent')
       ActiveSupport::Notifications.unsubscribe(subscriber)

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.8.2'
+  VERSION = '0.8.3.beta.0'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -10,6 +10,11 @@ describe Appsignal::Agent do
 
   let(:transaction) { regular_transaction }
 
+  context "pid" do
+    its(:master_pid) { should == Process.pid }
+    its(:pid) { should == Process.pid }
+  end
+
   describe "#sleep_time" do
     subject { Appsignal::Agent.new.sleep_time }
 
@@ -134,9 +139,21 @@ describe Appsignal::Agent do
   end
 
   describe "#enqueue" do
+    subject { Appsignal.agent }
+
     it "forwards to the aggregator" do
       subject.aggregator.should respond_to(:add)
       subject.aggregator.should_receive(:add).with(:foo)
+      subject.should_not_receive(:forked!)
+    end
+
+    context "if we have been forked" do
+      before { Process.stub(:pid => 9000000002) }
+
+      it "should call forked!" do
+        subject.aggregator.should_receive(:add).with(:foo)
+        subject.should_receive(:forked!)
+      end
     end
 
     after { subject.enqueue(:foo) }
@@ -191,17 +208,23 @@ describe Appsignal::Agent do
   end
 
   describe "#forked!" do
-    its(:forked?) { should be_false }
+    subject { Appsignal.agent }
 
-    it "should create a new aggregator and restart the thread" do
-      previous_aggregator = subject.aggregator
+    it "should create a new aggregator, set the new pid and restart the thread" do
+      master_pid = subject.master_pid
+      subject.pid.should == master_pid
+
+      Process.stub(:pid => 9000000001)
       subject.should_receive(:restart_thread)
+      previous_aggregator = subject.aggregator
 
       subject.forked!
 
-      subject.forked?.should be_true
       subject.aggregator.should_not == previous_aggregator
       subject.aggregator.should be_a Appsignal::Aggregator
+
+      subject.master_pid.should == master_pid
+      subject.pid.should == 9000000001
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3.beta.0
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3