appsignal 0.10.2 → 0.10.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.10.3
+* Shut down all operations when agent is not active
+* Separately rescue OpenSSL::SSL::SSLError
+
 # 0.10.2
 * Bugfix in event payload sanitization
 

data/lib/appsignal.rb

@@ -146,7 +146,7 @@ module Appsignal
         @logger = Logger.new($stdout)
         @logger.formatter = lambda do |severity, datetime, progname, msg|
           "appsignal: #{msg}\n"
-         end
+        end
       end
       @logger.level = Logger::INFO
       @logger << @in_memory_log.string if @in_memory_log
@@ -159,7 +159,8 @@ module Appsignal
     end
 
     def active?
-      config && config.active?
+      config && config.active? &&
+        agent && agent.active?
     end
 
     def is_ignored_exception?(exception)

data/lib/appsignal/agent.rb

@@ -6,7 +6,7 @@ module Appsignal
                   :transmitter, :subscriber, :paused
 
     def initialize
-      return unless Appsignal.active?
+      return unless Appsignal.config.active?
       if Appsignal.config.env == 'development'
         @sleep_time = 10.0
       else
@@ -18,9 +18,14 @@ module Appsignal
       @transmitter = Transmitter.new(ACTION)
       subscribe
       start_thread
+      @active = true
       Appsignal.logger.info('Started Appsignal agent')
     end
 
+    def active?
+      !! @active
+    end
+
     def start_thread
       Appsignal.logger.debug('Starting agent thread')
       @thread = Thread.new do
@@ -102,6 +107,8 @@ module Appsignal
         handle_result(
           transmitter.transmit(aggregator_to_be_sent.post_processed_queue!)
         )
+      rescue OpenSSL::SSL::SSLError => ex
+        Appsignal.logger.error "OpenSSL::SSL::SSLError: #{ex.message}"
       rescue Exception => ex
         Appsignal.logger.error "#{ex.class} while sending queue: #{ex.message}"
         Appsignal.logger.error ex.backtrace.join('\n')
@@ -119,6 +126,7 @@ module Appsignal
 
     def forked!
       Appsignal.logger.info('Forked worker process')
+      @active = true
       @pid = Process.pid
       Thread.exclusive do
         @aggregator = Aggregator.new
@@ -129,6 +137,7 @@ module Appsignal
 
     def shutdown(send_current_queue=false, reason=nil)
       Appsignal.logger.info("Shutting down agent (#{reason})")
+      @active = false
       unsubscribe
       stop_thread
       send_queue if send_current_queue && @aggregator.has_transactions?

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -10,6 +10,8 @@ describe Appsignal::Agent do
 
   let(:transaction) { regular_transaction }
 
+  its(:active?) { should be_true }
+
   context "pid" do
     its(:master_pid) { should == Process.pid }
     its(:pid) { should == Process.pid }
@@ -284,6 +286,15 @@ describe Appsignal::Agent do
         once
     end
 
+    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
+    end
+
     after { subject.send_queue }
   end
 
@@ -298,17 +309,20 @@ describe Appsignal::Agent do
   describe "#forked!" do
     subject { Appsignal.agent }
 
-    it "should create a new aggregator, set the new pid and restart the thread" do
+    it "should set active to true, 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.active = false
       subject.should_receive(:resubscribe)
       subject.should_receive(:restart_thread)
       previous_aggregator = subject.aggregator
 
       subject.forked!
 
+      subject.active?.should be_true
+
       subject.aggregator.should_not == previous_aggregator
       subject.aggregator.should be_a Appsignal::Aggregator
 
@@ -323,10 +337,15 @@ describe Appsignal::Agent do
       Thread.should_receive(:kill).with(subject.thread)
     end
 
+    it "should not be active anymore" 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')
+        Appsignal.logger.should_receive(:info).with('Shutting down agent (shutting down)')
+        subject.shutdown(false, 'shutting down')
       end
 
       context "with an empty queue" do
@@ -445,7 +464,7 @@ describe Appsignal::Agent do
   end
 
   context "when inactive" do
-    before { Appsignal.stub(:active? => false) }
+    before { Appsignal.config.stub(:active? => false) }
 
     it "should not start a thread" do
       Thread.should_not_receive(:new)

data/spec/lib/appsignal_spec.rb

@@ -124,20 +124,29 @@ describe Appsignal do
   describe '.active?' do
     subject { Appsignal.active? }
 
-    context "without config" do
-      before { Appsignal.config = nil }
+    context "without config and agent" do
+      before do
+        Appsignal.config = nil
+        Appsignal.agent = nil
+      end
 
       it { should be_false }
     end
 
-    context "with config but inactive" do
-      before { Appsignal.config = project_fixture_config('nonsense') }
+    context "with agent and inactive config" do
+      before do
+        Appsignal.config = project_fixture_config('nonsense')
+        Appsignal.agent = Appsignal::Agent.new
+      end
 
       it { should be_false }
     end
 
-    context "with active config" do
-      before { Appsignal.config = project_fixture_config }
+    context "with active agent and config" do
+      before do
+        Appsignal.config = project_fixture_config
+        Appsignal.agent = Appsignal::Agent.new
+      end
 
       it { should be_true }
     end
@@ -398,7 +407,7 @@ describe Appsignal do
       let(:tags) { nil }
 
       it "should send the exception to AppSignal" do
-        agent = double(:shutdown => true)
+        agent = double(:shutdown => true, :active? => true)
         Appsignal.stub(:agent).and_return(agent)
         agent.should_receive(:send_queue)
         agent.should_receive(:enqueue).with(kind_of(Appsignal::Transaction))

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
+  prerelease: 
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,104 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -120,8 +135,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -224,26 +239,27 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 859c45e8e3c4c18607db69172155bcba95894ff6
-  data.tar.gz: 2ce273fbee2435ff234f84caec78b8ff9f980940
-SHA512:
-  metadata.gz: 4fb5d774dfbd2dc99f8a2ac4a380dc22641eb7747797c3855311b88e40ea3ce60536456966a1da46f48453d6c33bc2ed21f24c960dda3d51f96779b9e57eb7b4
-  data.tar.gz: 01c652ae81255dca073ca584d3702fcfbc0642c8431d6efe6e3835a8217530020f35ebe55535a0f42881d73f886e75931f76b5184f0ba29054d65f616050b213