appsignal 0.12.rc.6 → 0.12.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe64f98d1b8c97db72efd6156489d159a3ddb9b
-  data.tar.gz: 8316b69cd151f561b860ebd2bc358b6594e4c630
+  metadata.gz: a531aa7d19fc95984cdd43be2973189fd4c346ce
+  data.tar.gz: af4743469d11f853cbc36b9db65febc1266e89f5
 SHA512:
-  metadata.gz: 99c14fa7284f1462ef60cdf20ca0fe19be83f5a31949b49b73c42d6301a0092a4bba7e8d894036e385e0c7bcc02a12a0455e97d9528443fffa9fd8f7676dfb27
-  data.tar.gz: b95489f8cabb4abe6483d77a8ae0547e7062e3c28b8050caef8a77612ffd0c6831b65d7642263d341050eb7497cd75a3addbe1ac4897ad2de0afe6f43cbe72ee
+  metadata.gz: c1a9902fcceb5d376b9759aede9bc9bdd64cb7df27ca9bbc4ab3186dc099eccd6bf7bff28cc6d42aa3ee0f96f5a7c4f5ccdb086df3c36659b4faa623d8b75872
+  data.tar.gz: 8a53db6b00208926547f3326fff4257d9d58cf8bf521f0abe6425be6f8ad49107d7dbc13731aa759bdd2676d01c6f0ad1706036d6928b400136ccc76ffa4ffe9

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-:version: f31de3b
+:version: e249c63
 :triples:
   x86_64-linux:
-    :checksum: 4ab3581f78e0c2cc96d51f79cabc067f1a6e8b5ea5fda1deb4c98ddd8c16d62e
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f31de3b/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: 444b04b39e98c3071bed05e337d17503ff736b1a830f3952868963cef7c36902
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e249c63/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   i686-linux:
-    :checksum: 1bc4425e9ee2b81cc7865b66e9dadb045033764b075bb3f84894a490387a2793
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f31de3b/appsignal-agent-i686-linux-static.tar.gz
+    :checksum: bd2fbb0f4185c0035b82b7a9a657b27b540696aa8a07bdbcac3a5651952957d7
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e249c63/appsignal-agent-i686-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 209579fb992cbe9fae30ee5e4bb0909eaa25ee5573df440c1e47c031fa1bb0db
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f31de3b/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 957340856e0b5ac3f6e0bd2d5f70679218caf6cecc47f998c27b661cdad750df
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e249c63/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/lib/appsignal.rb

@@ -12,16 +12,6 @@ module Appsignal
   class << self
     attr_accessor :config, :subscriber, :logger, :agent, :in_memory_log, :extension_loaded
 
-    def load_integrations
-      require 'appsignal/integrations/celluloid'
-      require 'appsignal/integrations/delayed_job'
-      require 'appsignal/integrations/passenger'
-      require 'appsignal/integrations/puma'
-      require 'appsignal/integrations/sidekiq'
-      require 'appsignal/integrations/resque'
-      require 'appsignal/integrations/unicorn'
-    end
-
     def load_instrumentations
       require 'appsignal/instrumentations/net_http' if config[:instrument_net_http]
       require 'appsignal/instrumentations/redis' if config[:instrument_redis]
@@ -60,7 +50,6 @@ module Appsignal
           logger.info("Starting AppSignal #{Appsignal::VERSION} on #{RUBY_VERSION}/#{RUBY_PLATFORM}")
           config.write_to_environment
           Appsignal::Extension.start
-          load_integrations
           load_instrumentations
           Appsignal::EventFormatter.initialize_formatters
           initialize_extensions
@@ -80,9 +69,10 @@ module Appsignal
     end
 
     def forked
+      return unless active?
       logger.debug('Forked process, resubscribing and restarting extension')
       Appsignal::Extension.start
-      @subscriber = Appsignal::Subscriber.new
+      @subscriber.resubscribe
     end
 
     # Wrap a transaction with appsignal monitoring.
@@ -269,7 +259,11 @@ require 'appsignal/version'
 require 'appsignal/rack/js_exception_catcher'
 require 'appsignal/js_exception_transaction'
 require 'appsignal/transmitter'
-
-# This needs to be required immediately, that's why it's
-# not in load_integrations
+require 'appsignal/integrations/celluloid'
+require 'appsignal/integrations/delayed_job'
+require 'appsignal/integrations/passenger'
+require 'appsignal/integrations/puma'
+require 'appsignal/integrations/sidekiq'
 require 'appsignal/integrations/rails'
+require 'appsignal/integrations/resque'
+require 'appsignal/integrations/unicorn'

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.rc.6'
+  VERSION = '0.12.rc.7'
 end

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

@@ -160,7 +160,7 @@ if capistrano3_present?
           it "should not send deploy marker" do
             Appsignal::Marker.should_not_receive(:new)
             invoke('appsignal:deploy')
-            io.string.should include("Not loading: config for 'nonsense' not found")
+            io.string.should include("Not loading from config file: config for 'nonsense' not found")
           end
         end
       end

data/spec/lib/appsignal_spec.rb

@@ -62,11 +62,6 @@ describe Appsignal do
         Appsignal.start
       end
 
-      it "should load integrations" do
-        Appsignal.should_receive(:load_integrations)
-        Appsignal.start
-      end
-
       it "should load instrumentations" do
         Appsignal.should_receive(:load_instrumentations)
         Appsignal.start
@@ -120,14 +115,6 @@ describe Appsignal do
       end
     end
 
-    describe ".load_integrations" do
-      it "should require the integrations" do
-        Appsignal.should_receive(:require).at_least(:once)
-      end
-
-      after { Appsignal.load_integrations }
-    end
-
     describe ".load_instrumentations" do
       before { Appsignal.config = project_fixture_config }
 
@@ -167,11 +154,26 @@ describe Appsignal do
   end
 
   describe ".forked" do
-    it "should resubscribe and start the extension" do
-      Appsignal::Extension.should_receive(:start)
-      Appsignal::Subscriber.should_receive(:new)
+    context "when not active" do
+      it "should should do nothing" do
+        Appsignal::Extension.should_not_receive(:start)
+        Appsignal::Subscriber.should_not_receive(:new)
+
+        Appsignal.forked
+      end
+    end
 
-      Appsignal.forked
+    context "when active" do
+      before do
+        Appsignal.config = project_fixture_config
+      end
+
+      it "should resubscribe and start the extension" do
+        Appsignal::Extension.should_receive(:start)
+        Appsignal::Subscriber.any_instance.should_receive(:resubscribe)
+
+        Appsignal.forked
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.6
+  version: 0.12.rc.7
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack