appsignal 0.12.rc.8 → 0.12.rc.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638229bbdb0e216279fb2f10390b72bf7f030f8b
-  data.tar.gz: 59785b7e222a6eefb6173c113d3b3bf03b74a3f7
+  metadata.gz: 17f4e46dd0c600079ccdb20831f64e73451749b4
+  data.tar.gz: 723ed8e27a02f660f8dc5135c8d4982a909c2bf6
 SHA512:
-  metadata.gz: 70b9b08911109dba74572017b040cfcacb7f8ea0b42f73304a24bba61a5a49a8c48f9065b839cf4d40e02cdb6fa513c220bce54c2b461b8fc49f30076ee13ee2
-  data.tar.gz: 09d494df6ba6f0abd07e2a00ac7f52c56e740e64fe682550d7cd6df45c05736fe99b8f1c70ac66809c54aefa74d5e4fa2ce4f52781b5001edba39d38428b5b6a
+  metadata.gz: 33d094d086f748d6932e93960bb1ebfd3cf1dcc3a77be03c68a3f32fca800caf35bb73551141c084702e6ecac3352cdad2f5d271dc083a74c9b3c8aca3fd16c7
+  data.tar.gz: ee504d004f15bab3e1786ef0b5241e8efa661d67883266559f81fc658b2e488c6d2904a53de91a01f54e0f72b0880577532002115d56411ca3b8c7b301e94daf

data/Rakefile

@@ -3,8 +3,6 @@ GEMFILES = %w(
   capistrano3
   no_dependencies
   padrino
-  rails-3.0
-  rails-3.1
   rails-3.2
   rails-4.0
   rails-4.1

data/ext/agent.yml

@@ -1,15 +1,15 @@
 ---
-:version: 4bf99f0
+:version: 526bdf1
 :triples:
   x86_64-linux:
-    :checksum: 7f02d2f36ff715254d9ec7b99c243ad3a2849ed05c79d0e7e11e4c7140aae576
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4bf99f0/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: d5d83c289af971b40f23dc41a41567e0d41e98d2754eeed4427b7b2473881818
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   i686-linux:
-    :checksum: 8103f83f4cf7d9bf22ebafb40216aede836d9d368cdf0f15d0d9644f3d9b4cf7
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4bf99f0/appsignal-agent-i686-linux-static.tar.gz
+    :checksum: b8b3bf1a5ae67e97ff623e1252c6f0299306951033e4fb93478aa76dc95218f1
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-i686-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 22937f34d26ea1dce722b102946a2f3daf3c30755d9f451c6440f580e3dc3eeb
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/4bf99f0/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 4eab82317a874d4d3b7fc666ce562fa7e5f346cda22707d556a236894269a838
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/526bdf1/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/gemfiles/rails-3.2.gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
 
+gem 'test-unit'
+
 gem 'generator_spec'
 
 gemspec :path => '../'

data/lib/appsignal.rb

@@ -41,7 +41,7 @@ module Appsignal
           logger.level = Logger::INFO
         end
         if config.active?
-          logger.info("Starting AppSignal #{Appsignal::VERSION} on #{RUBY_VERSION}/#{RUBY_PLATFORM}")
+          logger.info("Starting AppSignal #{Appsignal::VERSION} (#{$0}, Ruby #{RUBY_VERSION}, #{RUBY_PLATFORM})")
           config.write_to_environment
           Appsignal::Extension.start
           Appsignal::Hooks.load_hooks
@@ -192,8 +192,8 @@ module Appsignal
     end
 
     def start_logger(path_arg=nil)
-      path = Appsignal.config ? Appsignal.config[:log_file_path] : nil
-      if path && File.writable?(path) &&
+      path = Appsignal.config ? Appsignal.config.log_file_path : nil
+      if path && File.writable?(File.dirname(path)) &&
          !ENV['DYNO'] &&
          !ENV['SHELLYCLOUD_DEPLOYMENT']
         @logger = Logger.new(path)

data/lib/appsignal/config.rb

@@ -30,7 +30,7 @@ module Appsignal
       'APPSIGNAL_PUSH_API_ENDPOINT'              => :endpoint,
       'APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH'   => :frontend_error_catching_path,
       'APPSIGNAL_DEBUG'                          => :debug,
-      'APPSIGNAL_LOG_FILE_PATH'                  => :log_file_path,
+      'APPSIGNAL_LOG_PATH'                       => :log_path,
       'APPSIGNAL_INSTRUMENT_NET_HTTP'            => :instrument_net_http,
       'APPSIGNAL_INSTRUMENT_REDIS'               => :instrument_redis,
       'APPSIGNAL_INSTRUMENT_SEQUEL'              => :instrument_sequel,
@@ -71,6 +71,14 @@ module Appsignal
       config_hash[key]
     end
 
+    def log_file_path
+      path = config_hash[:log_path] || root_path
+      File.join(File.realpath(path), 'appsignal.log')
+    rescue Errno::ENOENT
+      puts "appsignal: WARNING: log file path '#{path}' does not exist or is not writable"
+      nil
+    end
+
     def valid?
       @valid
     end
@@ -87,7 +95,7 @@ module Appsignal
       ENV['APPSIGNAL_AGENT_VERSION']                = Appsignal::Extension.agent_version
       ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'] = Appsignal::VERSION
       ENV['APPSIGNAL_DEBUG_LOGGING']                = config_hash[:debug].to_s
-      ENV['APPSIGNAL_LOG_FILE_PATH']                = config_hash[:log_file_path].to_s if config_hash[:log_file_path]
+      ENV['APPSIGNAL_LOG_FILE_PATH']                = log_file_path.to_s if log_file_path
       ENV['APPSIGNAL_PUSH_API_ENDPOINT']            = config_hash[:endpoint]
       ENV['APPSIGNAL_PUSH_API_KEY']                 = config_hash[:push_api_key]
       ENV['APPSIGNAL_APP_NAME']                     = config_hash[:name]
@@ -134,7 +142,7 @@ module Appsignal
 
       # Configuration with string type
       %w(APPSIGNAL_PUSH_API_KEY APPSIGNAL_APP_NAME APPSIGNAL_PUSH_API_ENDPOINT
-         APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_FILE_PATH).each do |var|
+         APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_PATH).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var
         end

data/lib/appsignal/hooks/redis.rb

@@ -5,6 +5,7 @@ module Appsignal
 
       def dependencies_present?
         defined?(::Redis) &&
+          Appsignal.config &&
           Appsignal.config[:instrument_redis]
       end
 

data/lib/appsignal/hooks/sequel.rb

@@ -20,6 +20,7 @@ module Appsignal
 
       def dependencies_present?
         defined?(::Sequel::Database) &&
+          Appsignal.config &&
           Appsignal.config[:instrument_sequel]
       end
 

data/lib/appsignal/integrations/padrino.rb

@@ -9,7 +9,7 @@ module Appsignal::Integrations
       Appsignal.config = Appsignal::Config.new(
         root,
         Padrino.env,
-        :log_file_path => File.join(root, 'log/appsignal.log')
+        :log_path => File.join(root, 'log')
       )
 
       Appsignal.start_logger

data/lib/appsignal/integrations/railtie.rb

@@ -15,7 +15,7 @@ module Appsignal
           Rails.root,
           ENV.fetch('APPSIGNAL_APP_ENV', Rails.env),
           :name => Rails.application.class.parent_name,
-          :log_file_path => Rails.root.join('log/appsignal.log')
+          :log_path => Rails.root.join('log')
         )
 
         # Start logger

data/lib/appsignal/integrations/sinatra.rb

@@ -6,8 +6,7 @@ Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root,
-  app_settings.environment,
-  :log_file_path => File.join(app_settings.root, 'appsignal.log')
+  app_settings.environment
 )
 
 Appsignal.start_logger

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/config_spec.rb

@@ -11,8 +11,9 @@ describe Appsignal::Config do
       subject
     end
 
-    its(:valid?)  { should be_true }
-    its(:active?) { should be_true }
+    its(:valid?)        { should be_true }
+    its(:active?)       { should be_true }
+    its(:log_file_path) { should end_with('spec/support/project_fixture/appsignal.log') }
 
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
@@ -35,6 +36,12 @@ describe Appsignal::Config do
       }
     end
 
+    context "if a log file path is set" do
+      let(:config) { project_fixture_config('production', :log_path => '/tmp') }
+
+      its(:log_file_path) { should end_with('/tmp/appsignal.log') }
+    end
+
     context "when there is a pre 0.12 style endpoint" do
       let(:config) { project_fixture_config('production', :endpoint => 'https://push.appsignal.com/1') }
 
@@ -65,7 +72,7 @@ describe Appsignal::Config do
       before do
         subject.config_hash[:http_proxy]     = 'http://localhost'
         subject.config_hash[:ignore_actions] = ['action1', 'action2']
-        subject.config_hash[:log_file_path]  = '/var/log/appsignal.log'
+        subject.config_hash[:log_path]  = '/tmp'
         subject.write_to_environment
       end
 
@@ -74,7 +81,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_APP_PATH'].should                     end_with('spec/support/project_fixture')
         ENV['APPSIGNAL_AGENT_PATH'].should                   end_with('/ext')
         ENV['APPSIGNAL_DEBUG_LOGGING'].should                == 'false'
-        ENV['APPSIGNAL_LOG_FILE_PATH'].should                == '/var/log/appsignal.log'
+        ENV['APPSIGNAL_LOG_FILE_PATH'].should                end_with('/tmp/appsignal.log')
         ENV['APPSIGNAL_PUSH_API_ENDPOINT'].should            == 'https://push.appsignal.com'
         ENV['APPSIGNAL_PUSH_API_KEY'].should                 == 'abc'
         ENV['APPSIGNAL_APP_NAME'].should                     == 'TestApp'
@@ -148,10 +155,11 @@ describe Appsignal::Config do
 
   context "when there is no config file" do
     let(:initial_config) { {} }
-    let(:config) { Appsignal::Config.new('/nothing', 'production', initial_config) }
+    let(:config) { Appsignal::Config.new('/tmp', 'production', initial_config) }
 
-    its(:valid?)  { should be_false }
-    its(:active?) { should be_false }
+    its(:valid?)        { should be_false }
+    its(:active?)       { should be_false }
+    its(:log_file_path) { should end_with('/tmp/appsignal.log') }
 
     context "with valid config in the environment" do
       before do

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

@@ -23,15 +23,17 @@ if rails_present?
       end
 
       context "config" do
-        before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
         subject { Appsignal.config }
+        context "basics" do
+          before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
 
-        it { should be_a(Appsignal::Config) }
+          it { should be_a(Appsignal::Config) }
 
-        its(:root_path)       { should == Pathname.new(project_fixture_path) }
-        its(:env)             { should == 'test' }
-        its([:name])          { should == 'TestApp' }
-        its([:log_file_path]) { should == Pathname.new(File.join(project_fixture_path, 'log/appsignal.log')) }
+          its(:root_path)  { should == Pathname.new(project_fixture_path) }
+          its(:env)        { should == 'test' }
+          its([:name])     { should == 'TestApp' }
+          its([:log_path]) { should == Pathname.new(File.join(project_fixture_path, 'log')) }
+        end
 
         context "initial config" do
           before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
@@ -41,10 +43,9 @@ if rails_present?
         end
 
         context "with APPSIGNAL_APP_ENV ENV var set" do
-          around do |sample|
-            ENV['APPSIGNAL_APP_ENV'] = 'env_test'
-            sample.run
-            ENV.delete('APPSIGNAL_APP_ENV')
+          before do
+            ENV.should_receive(:fetch).with('APPSIGNAL_APP_ENV', 'test').and_return('env_test')
+            Appsignal::Integrations::Railtie.initialize_appsignal(app)
           end
 
           its(:env) { should == 'env_test' }

data/spec/lib/appsignal_spec.rb

@@ -426,16 +426,17 @@ describe Appsignal do
 
     describe ".start_logger" do
       let(:out_stream) { StringIO.new }
-      let(:path) { File.join(project_fixture_path, 'log') }
-      let(:log_file) { File.join(path, 'appsignal.log') }
+      let(:log_path) { File.join(project_fixture_path, 'log') }
+      let(:log_file) { File.join(log_path, 'appsignal.log') }
 
       before do
+        FileUtils.rm_f(log_file)
         @original_stdout = $stdout
         $stdout = out_stream
         Appsignal.logger.error('Log something')
         Appsignal.config = project_fixture_config(
           'production',
-          :log_file_path => log_file
+          :log_path => log_path
         )
       end
       after do
@@ -453,7 +454,7 @@ describe Appsignal do
       end
 
       context "when the log path is not writable" do
-        let(:path) { '/nonsense/log' }
+        let(:log_path) { '/nonsense/log' }
 
         it "should log to stdout" do
           Appsignal.start_logger

data/spec/support/helpers/config_helpers.rb

@@ -5,16 +5,11 @@ module ConfigHelpers
     )
   end
 
-  def project_fixture_log_file
-    File.join(project_fixture_path, 'log/appsignal.log')
-  end
-
-  def project_fixture_config(env='production', initial_config={}, logger=Logger.new(project_fixture_log_file))
+  def project_fixture_config(env='production', initial_config={})
     Appsignal::Config.new(
       project_fixture_path,
       env,
-      initial_config,
-      logger
+      initial_config
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.rc.8
+  version: 0.12.rc.9
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -136,8 +136,6 @@ files:
 - gemfiles/capistrano3.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
-- gemfiles/rails-3.0.gemfile
-- gemfiles/rails-3.1.gemfile
 - gemfiles/rails-3.2.gemfile
 - gemfiles/rails-4.0.gemfile
 - gemfiles/rails-4.1.gemfile

data/gemfiles/rails-3.0.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.0.20'
-
-gem 'generator_spec'
-
-gemspec :path => '../'

data/gemfiles/rails-3.1.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.1.12'
-
-gem 'generator_spec'
-
-gemspec :path => '../'