appsignal 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756c150a23728cec1d98ae30f303bdd73380a35c
-  data.tar.gz: bca41b183baf6e32283dca4873131c543667e0dc
+  metadata.gz: b534937f18014e6942e96590872f412395b628c7
+  data.tar.gz: 59e4b4d4ad5bb0eec58a9814a26680cb055966e9
 SHA512:
-  metadata.gz: e2143e8018f3b30037001e3a97a14872eda5f3477e20e943cf203cb110e9b9d7ffc74ef032260a69508dd99e08d4f52df96e00d2eb4da6023cdc0979872959d3
-  data.tar.gz: 57dc1ab983670990a8d4d19b33a84bedf694f3bc3170754bd3fe80c540cef5b34a344e42d619e752bf859aa4a2c0f98dee559fee571910728ca3233460a1aa14
+  metadata.gz: 5345239997a144a05a572da7744cb3eb3c405931c3b3b37b0a4c1fcc1e49db7778abc22d39733ad711dd28ed1e535197ec9f0aa0dd1e5c346cd0db326a03bb0a
+  data.tar.gz: b144ad46eba9528a1d98c08dd6ba6fd701e443ae7425a8a34390bde2dfd20bf88204430d7d4c6a57ec98c6965e2dcc87cf04b847d82b65f686a877f5a9a3bbb9

data/.gitignore

@@ -2,7 +2,6 @@
 *.sassc
 .sass-cache
 capybara-*.html
-.rspec
 *.log
 /.bundle
 /vendor/bundle

data/.rspec

@@ -0,0 +1 @@
+--order default

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.10.5
+* Don't shutdown in `at_exit`
+* Debug log about missing name in config
+
 # 0.10.4
 * Add REQUEST_URI and PATH_INFO to env params whitelist
 

data/lib/appsignal.rb

@@ -52,7 +52,7 @@ module Appsignal
           @agent = Appsignal::Agent.new
           at_exit do
             logger.debug('Running at_exit block')
-            @agent.shutdown(true, 'ran at_exit')
+            @agent.send_queue
           end
         else
           logger.info("Not starting, not active for #{config.env}")

data/lib/appsignal/agent.rb

@@ -104,6 +104,7 @@ module Appsignal
       end
 
       begin
+        return unless aggregator_to_be_sent.has_transactions?
         handle_result(
           transmitter.transmit(aggregator_to_be_sent.post_processed_queue!)
         )
@@ -140,7 +141,7 @@ module Appsignal
       @active = false
       unsubscribe
       stop_thread
-      send_queue if send_current_queue && @aggregator.has_transactions?
+      send_queue if send_current_queue
     end
 
     protected

data/lib/appsignal/config.rb

@@ -43,6 +43,12 @@ module Appsignal
           "and no APPSIGNAL_PUSH_API_KEY env var present"
         )
       end
+      if config_hash && !config_hash[:name]
+        @logger.debug(
+          "There's no name defined in the config, " \
+          "unless you're using the Heroku add-on you probably want to do this."
+        )
+      end
     end
 
     def loaded?

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -250,49 +250,61 @@ describe Appsignal::Agent do
   end
 
   describe "#send_queue" do
-    it "transmits" do
-      subject.aggregator.stub(:post_processed_queue! => :foo)
-      subject.transmitter.should_receive(:transmit).with(:foo)
+    context "without transactions" do
+      it "does not transmit" do
+        subject.should_not_receive(:handle_result)
+      end
     end
 
-    it "handles the return code" do
-      subject.transmitter.stub(:transmit => '200')
-      subject.should_receive(:handle_result).with('200')
-    end
+    context "with transactions" do
+      before do
+        subject.aggregator.stub(:has_transactions? => true)
+      end
 
-    it "handle exceptions in post processing" do
-      subject.aggregator.stub(:post_processed_queue!).and_raise(
-        PostProcessingException.new('Message')
-      )
-
-      Appsignal.logger.should_receive(:error).
-        with('PostProcessingException while sending queue: Message').
-        once
-      Appsignal.logger.should_receive(:error).
-        with(kind_of(String)).
-        once
-    end
+      it "transmits" do
+        subject.aggregator.stub(:post_processed_queue! => :foo)
+        subject.transmitter.should_receive(:transmit).with(:foo)
+      end
 
-    it "handles exceptions in transmit" do
-      subject.transmitter.stub(:transmit).and_raise(
-        Exception.new('Message')
-      )
-
-      Appsignal.logger.should_receive(:error).
-        with('Exception while sending queue: Message').
-        once
-      Appsignal.logger.should_receive(:error).
-        with(kind_of(String)).
-        once
-    end
+      it "handles the return code" do
+        subject.transmitter.stub(:transmit => '200')
+        subject.should_receive(:handle_result).with('200')
+      end
+
+      it "handle exceptions in post processing" do
+        subject.aggregator.stub(:post_processed_queue!).and_raise(
+          PostProcessingException.new('Message')
+        )
+
+        Appsignal.logger.should_receive(:error).
+          with('PostProcessingException while sending queue: Message').
+          once
+        Appsignal.logger.should_receive(:error).
+          with(kind_of(String)).
+          once
+      end
+
+      it "handles exceptions in transmit" do
+        subject.transmitter.stub(:transmit).and_raise(
+          Exception.new('Message')
+        )
+
+        Appsignal.logger.should_receive(:error).
+          with('Exception while sending queue: Message').
+          once
+        Appsignal.logger.should_receive(:error).
+          with(kind_of(String)).
+          once
+      end
 
-    it "handles an OpenSSL error in transmit" do
-      subject.transmitter.stub(:transmit).and_raise(
-        OpenSSL::SSL::SSLError.new('Message')
-      )
+      it "handles an OpenSSL error in transmit" do
+        subject.transmitter.stub(:transmit).and_raise(
+          OpenSSL::SSL::SSLError.new('Message')
+        )
 
-      Appsignal.logger.should_receive(:error).
-        with('OpenSSL::SSL::SSLError: Message').once
+        Appsignal.logger.should_receive(:error).
+          with('OpenSSL::SSL::SSLError: Message').once
+      end
     end
 
     after { subject.send_queue }
@@ -337,50 +349,26 @@ describe Appsignal::Agent do
       Thread.should_receive(:kill).with(subject.thread)
     end
 
-    it "should not be active anymore" do
+    it "should not be active anymore after shutting down" do
       subject.shutdown
       subject.active?.should be_false
     end
 
-    context "when not sending the current queue" do
-      it "should log the reason for shutting down" do
-        Appsignal.logger.should_receive(:info).with('Shutting down agent (shutting down)')
-        subject.shutdown(false, 'shutting down')
-      end
-
-      context "with an empty queue" do
-        it "should shutdown" do
-          subject.shutdown
-        end
-      end
-
-      context "with a queue with transactions" do
-        it "should shutdown" do
-          subject.enqueue(slow_transaction)
-          subject.should_not_receive(:send_queue)
-
-          subject.shutdown
-        end
-      end
+    it "should log the reason for shutting down" do
+      Appsignal.logger.should_receive(:info).with('Shutting down agent (shutting down)')
+      subject.shutdown(false, 'shutting down')
     end
 
-    context "when the queue is to be sent" do
-      context "with an empty queue" do
-        it "should shutdown" do
-          subject.should_not_receive(:send_queue)
+    it "should send the queue and shut down if the queue is to be sent" do
+      subject.should_receive(:send_queue)
 
-          subject.shutdown(true, nil)
-        end
-      end
+      subject.shutdown(true, nil)
+    end
 
-      context "with a queue with transactions" do
-        it "should send the queue and shutdown" do
-          subject.enqueue(slow_transaction)
-          subject.should_receive(:send_queue)
+    it "should only shutdown if the queue is not be sent" do
+      subject.should_not_receive(:send_queue)
 
-          subject.shutdown(true, nil)
-        end
-      end
+      subject.shutdown(false, nil)
     end
   end
 

data/spec/lib/appsignal/config_spec.rb

@@ -120,7 +120,11 @@ describe Appsignal::Config do
       its(:loaded?) { should be_true }
       its(:active?) { should be_true }
 
-      it "should merge with the default config and fill the config hash" do
+      it "should merge with the default config, fill the config hash and log about the missing name" do
+        Appsignal.logger.should_receive(:debug).with(
+          "There's no name defined in the config, unless you're using the Heroku add-on you probably want to do this."
+        )
+
         subject.config_hash.should == {
           :push_api_key => 'push_api_key',
           :ignore_exceptions => [],
@@ -133,10 +137,11 @@ describe Appsignal::Config do
         }
       end
 
-      context "and an initial config is present" do
+      context "and an initial config with a name is present" do
         let(:initial_config) { {:name => 'Initial Name'} }
 
         it "should merge with the config" do
+          Appsignal.logger.should_not_receive(:debug)
           subject[:name].should == 'Initial Name'
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -121,6 +121,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile