appsignal 0.7.0.beta.1 → 0.7.1.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGRlODlhNDE2MjZhZjY0NTJiMDA0OGJlNTk1NGZjMjZjMmM1ZjdlNA==
+    ODY1ZmU5ZTI5Y2ZlZWM5Mzk0OTUxNGVkYTVhNDEzNTQwM2UwYTE5NQ==
   data.tar.gz: !binary |-
-    ODNjODNiODliMTM1ZWFjNWNlOTIxNDNiNzIwNTIwMWJkNGQ4MDc1Yg==
+    N2FkZTY5OGIzMWEwZTYzZjM1NDk3ZmRjY2VjYWQ1MGM0MGUwMWM1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWUwN2M0N2U1ZWFjYTUxZWJlNGE2ZTU4YWVhZTFmMDEyOWI5MmFiYjY1NWJk
-    ZDFjNjQ5MDk2NTNlOWQzMjM5OWNhMmEyMTRiZDE0NzlkYWU4YWQ3ZjNkYzYy
-    NTk0MTY2ZmJkMTRhYTg5YjcwODhjN2VkNGNiMzhkOGE2ZDAwZTY=
+    YTJjYmMyMWZhNTE0NDk5Y2ZlOGI0ZTNlMGRmZDNjMzMyM2JmYmEzNjY0Yzkx
+    MzNjZTBmZGJhOWNlMjYyYjA3ODRiNThkNDkwNmJjMDIwZWEyZGZjOWQ4YWY3
+    MDQyMjY4MTE1MzNiYWE2ZWJmY2RhMTFjYTlkNGIxOGY4YTg3ZGQ=
   data.tar.gz: !binary |-
-    MWU1M2M4ZDI1NWM2NjgzZTdmNjRkMDRkOTJlYTM0YzA2MjM5Nzc1MDNlNmMx
-    NDBlYzkyY2Q5M2Q0YTA4OWYwMGI5YzVhNDcwM2RmZjAwYzQ1MjgwNmJiMWU4
-    YmVmMDVkNTA1ZDAxMGM2ZDQ4YmM4OTY3ZWVjOWU3ODM4NGYyNjU=
+    ZWIwNTUxNDZkMzg4Y2FkMDBlMzk0NTc1Mzg4YTgwNzM3NjlmNjI4NjY0NWQ1
+    NjU0MjA2M2Y5NjY4YmYzMTVjOTIwNWJkMzMyNjdhY2JkODk5NDFmYjVkOWY2
+    MWViZmIzNGM4ZWZlMDE1MzBlMDI2MTQyMTEyZjc3YzlkODUzZmM=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.7.1
+* Better support for forking webservers
+
 # 0.7.0
 * Mayor refactor and cleanup
 * New easier onboarding process

data/lib/appsignal.rb

@@ -16,6 +16,7 @@ module Appsignal
         end
         logger.info("Starting appsignal-#{Appsignal::VERSION}")
         @agent = Appsignal::Agent.new
+        at_exit { @agent.shutdown(true) }
       else
         logger.error("Can't start, no config loaded")
       end
@@ -118,4 +119,5 @@ require 'appsignal/transmitter'
 require 'appsignal/version'
 
 require 'appsignal/integrations/passenger'
+require 'appsignal/integrations/unicorn'
 require 'appsignal/integrations/rails'

data/lib/appsignal/agent.rb

@@ -2,7 +2,7 @@ module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
 
-    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter, :subscriber
+    attr_accessor :aggregator, :thread, :active, :sleep_time, :transmitter, :subscriber
 
     def initialize
       return unless Appsignal.active?
@@ -15,8 +15,6 @@ module Appsignal
       @transmitter = Transmitter.new(ACTION)
       subscribe
       start_thread
-      # Shutdown at exit. This does not work in passenger, see integrations/passenger
-      #at_exit { Appsignal.agent.shutdown(true) }
       Appsignal.logger.info('Started Appsignal agent')
     end
 
@@ -31,6 +29,14 @@ module Appsignal
       end
     end
 
+    def restart_thread
+      if @thread && @thread.alive?
+        Appsignal.logger.debug 'Killing agent thread'
+        Thread.kill(@thread)
+      end
+      start_thread
+    end
+
     def subscribe
       Appsignal.logger.debug('Subscribing to notifications')
       # Subscribe to notifications that don't start with a !
@@ -71,9 +77,12 @@ module Appsignal
     end
 
     def forked!
+      Appsignal.logger.debug('Forked worker process')
       @forked = true
-      @aggregator = Aggregator.new
-      Appsignal.logger.info('Forked the Appsignal agent')
+      Thread.exclusive do
+        @aggregator = Aggregator.new
+      end
+      restart_thread
     end
 
     def forked?
@@ -81,7 +90,7 @@ module Appsignal
     end
 
     def shutdown(send_current_queue=false)
-      Appsignal.logger.info('Shutting down the agent')
+      Appsignal.logger.info('Shutting down agent')
       ActiveSupport::Notifications.unsubscribe(subscriber)
       Thread.kill(thread) if thread
       send_queue if send_current_queue && @aggregator.has_transactions?

data/lib/appsignal/integrations/unicorn.rb

@@ -0,0 +1,25 @@
+if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
+  Appsignal.logger.info('Using Unicorn')
+
+  # We'd love to be able to hook this into Unicorn in a less
+  # intrusive way, but this is the best we can do given the
+  # options we have.
+
+  class Unicorn::HttpServer
+    alias_method :original_worker_loop, :worker_loop
+
+    def worker_loop(worker)
+      Appsignal.agent.forked!
+      original_worker_loop(worker)
+    end
+  end
+
+  class Unicorn::Worker
+    alias_method :original_close, :close
+
+    def close
+      Appsignal.agent.shutdown(true)
+      original_close
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.7.0.beta.1'
+  VERSION = '0.7.1.beta.1'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -25,8 +25,56 @@ describe Appsignal::Agent do
   end
 
   describe "#start_thread" do
-    it "should have started a background thread" do
+    before { subject.thread = nil }
+
+    it "should start a background thread" do
+      subject.start_thread
+
       subject.thread.should be_a(Thread)
+      subject.thread.should be_alive
+    end
+  end
+
+  describe "#restart_thread" do
+    context "if there is no thread" do
+      before { subject.thread = nil }
+
+      it "should start a thread" do
+        subject.restart_thread
+
+        subject.thread.should be_a(Thread)
+        subject.thread.should be_alive
+      end
+    end
+
+    context "if there is an inactive thread" do
+      before do
+        Thread.kill(subject.thread)
+        sleep 0.1 # We need to wait for the thread to exit
+      end
+
+      it "should start a thread" do
+        subject.restart_thread
+
+        subject.thread.should be_a(Thread)
+        subject.thread.should be_alive
+      end
+    end
+
+    context "if there is an active thread" do
+      it "should kill the current thread and start a new one" do
+        previous_thread = subject.thread
+        previous_thread.should be_alive
+
+        subject.restart_thread
+
+        subject.thread.should be_a(Thread)
+        subject.thread.should be_alive
+        subject.thread.should_not == previous_thread
+
+        sleep 0.1 # We need to wait for the thread to exit
+        previous_thread.should_not be_alive
+      end
     end
   end
 

data/spec/lib/appsignal/integrations/passenger_spec.rb

@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe "Passenger integration" do
   let(:file) { File.expand_path('lib/appsignal/integrations/passenger.rb') }
-  before(:all) { module PhusionPassenger ; end }
+  before(:all) do
+    module PhusionPassenger
+    end
+  end
 
   it "adds behavior to stopping_worker_process and starting_worker_process" do
     PhusionPassenger.should_receive(:on_event).with(:starting_worker_process)

data/spec/lib/appsignal/integrations/unicorn_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "Unicorn integration" do
+  let(:file) { File.expand_path('lib/appsignal/integrations/unicorn.rb') }
+  before(:all) do
+    module Unicorn
+      class HttpServer
+        def worker_loop(worker)
+        end
+      end
+
+      class Worker
+        def close
+        end
+      end
+    end
+  end
+  before do
+    load file
+    start_agent
+  end
+
+  it "adds behavior to Unicorn::HttpServer#worker_loop" do
+    server = Unicorn::HttpServer.new
+    worker = double
+
+    Appsignal.agent.should_receive(:forked!)
+    server.should_receive(:original_worker_loop).with(worker)
+
+    server.worker_loop(worker)
+  end
+
+  it "should add behavior to Unicorn::Worker#close" do
+    worker = Unicorn::Worker.new
+
+    Appsignal.agent.should_receive(:shutdown).with(true)
+    worker.should_receive(:original_close)
+
+    worker.close
+  end
+
+  context "without unicorn" do
+    before(:all) { Object.send(:remove_const, :Unicorn) }
+
+    specify { expect { Unicorn }.to raise_error(NameError) }
+    specify { expect { load file }.to_not raise_error }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta.1
+  version: 0.7.1.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,6 +154,7 @@ files:
 - lib/appsignal/integrations/passenger.rb
 - lib/appsignal/integrations/rails.rb
 - lib/appsignal/integrations/sinatra.rb
+- lib/appsignal/integrations/unicorn.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/rack/instrumentation.rb
 - lib/appsignal/rack/listener.rb
@@ -180,6 +181,7 @@ files:
 - spec/lib/appsignal/integrations/passenger_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/integrations/unicorn_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/listener_spec.rb
@@ -239,6 +241,7 @@ test_files:
 - spec/lib/appsignal/integrations/passenger_spec.rb
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/integrations/unicorn_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/listener_spec.rb