appsignal 0.12.beta.53 → 0.12.beta.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8dff871c0cdee9f6d75da2a42a5a25e2231c165
-  data.tar.gz: dc9ce6bc64507c0fd32f4cf8712a3f4be998d48f
+  metadata.gz: c869da1b4f47565f79929f3b4fa58dcf1b16a4e7
+  data.tar.gz: 841f08c157e237bb3b86f2050e36ae0ffa24e9af
 SHA512:
-  metadata.gz: ce7fe3492bf922bceeaf9be9666c403743adba1ec2930c40e1e0eb9d834da8b89853971eee8dba38fec4dc6316fb6b3c9912a1d710a57ad6d2651bfeefb3f282
-  data.tar.gz: 1d18a1857fbb541c4fa1ccc70e18989f6341db06c93ac0b0e98d4028d826af137f6639fac31a635a2f44c90c0701e2d30ad99fb898b7a680055b38956978bd36
+  metadata.gz: b5fee20a893a776c958c7dd39dd66cf5126dfd401aa8beaf2d9d111c977e032d93b05fab0a2c77feaf02050c0de44e5f2ea702bb681b72e57df03cd333b317bb
+  data.tar.gz: c1dcf58993ba75b63f82dc86942d8e7613ae5f81a2a9f7c4f49f8d4647dbd00c195b7d337036e3f777fdd8c02b9a4af3e88e67576346ec15d15a1b88ea79d900

data/ext/agent.yml

@@ -1,11 +1,11 @@
 ---
-:version: b52a8cc
+:version: 235949b
 :triples:
   x86_64-linux:
-    :checksum: 676cf1186fbf79c43289e4ebe162c46820abcefc323e1a06955b96d44afca4e4
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b52a8cc/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: 75f5e16f5f21bf2ea52c8d37a4b6aee54e3ebfdee25c84a6580327f575d167a2
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/235949b/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: e4266a77c81b0a4c4a8e09eb4ac3dccc5278579510a5a22ed767de0dc7178f01
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/b52a8cc/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 4ffe599644f3ca56613a94a5656838f3ead6ae7751369aa0d0abf37dd518a367
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/235949b/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/lib/appsignal.rb

@@ -206,11 +206,12 @@ module Appsignal
         end
     end
 
-    def start_logger(path)
+    def start_logger(path_arg=nil)
+      path = Appsignal.config ? Appsignal.config[:log_file_path] : nil
       if path && File.writable?(path) &&
          !ENV['DYNO'] &&
          !ENV['SHELLYCLOUD_DEPLOYMENT']
-        @logger = Logger.new(File.join(path, 'appsignal.log'))
+        @logger = Logger.new(path)
         @logger.formatter = log_formatter
       else
         @logger = Logger.new($stdout)
@@ -220,6 +221,10 @@ module Appsignal
       end
       @logger.level = Logger::INFO
       @logger << @in_memory_log.string if @in_memory_log
+
+      if path_arg
+        @logger.info('Setting the path in start_logger has no effect anymore, set it in the config instead')
+      end
     end
 
     def extension_loaded?

data/lib/appsignal/config.rb

@@ -28,6 +28,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_INSTRUMENT_NET_HTTP'            => :instrument_net_http,
       'APPSIGNAL_SKIP_SESSION_DATA'              => :skip_session_data,
       'APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING' => :enable_frontend_error_catching,
@@ -81,6 +82,7 @@ module Appsignal
       ENV['APPSIGNAL_ENVIRONMENT']       = env
       ENV['APPSIGNAL_AGENT_VERSION']     = Appsignal::Extension.agent_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_PUSH_API_ENDPOINT'] = config_hash[:endpoint]
       ENV['APPSIGNAL_PUSH_API_KEY']      = config_hash[:push_api_key]
       ENV['APPSIGNAL_APP_NAME']          = config_hash[:name]
@@ -127,7 +129,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).each do |var|
+         APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_FILE_PATH).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var
         end

data/lib/appsignal/integrations/padrino.rb

@@ -6,9 +6,13 @@ module Appsignal::Integrations
       Appsignal.logger.info("Loading Padrino (#{Padrino::VERSION}) integration")
 
       root             = Padrino.mounted_root
-      Appsignal.config = Appsignal::Config.new(root, Padrino.env)
+      Appsignal.config = Appsignal::Config.new(
+        root,
+        Padrino.env,
+        :log_file_path => File.join(root, 'log/appsignal.log')
+      )
 
-      Appsignal.start_logger(File.join(root, 'log'))
+      Appsignal.start_logger
       Appsignal.start
     end
   end

data/lib/appsignal/integrations/rails.rb

@@ -11,16 +11,17 @@ if defined?(::Rails)
         end
 
         def self.initialize_appsignal(app)
-          # Start logger
-          Appsignal.start_logger(Rails.root.join('log'))
-
           # Load config
           Appsignal.config = Appsignal::Config.new(
             Rails.root,
             ENV.fetch('APPSIGNAL_APP_ENV', Rails.env),
-            :name => Rails.application.class.parent_name
+            :name => Rails.application.class.parent_name,
+            :log_file_path => Rails.root.join('log/appsignal.log')
           )
 
+          # Start logger
+          Appsignal.start_logger
+
           app.middleware.insert_before(
             ActionDispatch::RemoteIp,
             Appsignal::Rack::RailsInstrumentation

data/lib/appsignal/integrations/sinatra.rb

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

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.beta.53'
+  VERSION = '0.12.beta.54'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -63,6 +63,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.write_to_environment
       end
 
@@ -71,6 +72,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_PUSH_API_ENDPOINT'].should == 'https://push.appsignal.com'
         ENV['APPSIGNAL_PUSH_API_KEY'].should      == 'abc'
         ENV['APPSIGNAL_APP_NAME'].should          == 'TestApp'

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

@@ -28,9 +28,10 @@ if rails_present?
 
         it { should be_a(Appsignal::Config) }
 
-        its(:root_path) { should == Pathname.new(project_fixture_path) }
-        its(:env)       { should == 'test' }
-        its([:name])    { should == 'TestApp' }
+        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')) }
 
         context "initial config" do
           before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }

data/spec/lib/appsignal_spec.rb

@@ -5,9 +5,7 @@ describe Appsignal do
   before do
     # Make sure we have a clean state because we want to test
     # initialization here.
-    Appsignal.agent.shutdown if Appsignal.agent
     Appsignal.config = nil
-    Appsignal.agent = nil
     Appsignal.extensions.clear
   end
 
@@ -453,68 +451,75 @@ 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') }
+
       before do
         @original_stdout = $stdout
         $stdout = out_stream
         Appsignal.logger.error('Log something')
+        Appsignal.config = project_fixture_config(
+          'production',
+          :log_file_path => log_file
+        )
       end
       after do
         $stdout = @original_stdout
       end
 
       context "when the log path is writable" do
-        let(:path) { File.join(project_fixture_path, 'log') }
-        before { Appsignal.start_logger(path) }
-
         it "should log to file" do
+          Appsignal.start_logger
+          Appsignal.logger.error('Log to file')
           File.exists?(log_file).should be_true
+          File.open(log_file).read.should include 'Log to file'
           File.open(log_file).read.should include 'Log something'
         end
       end
 
       context "when the log path is not writable" do
         let(:path) { '/nonsense/log' }
-        before { Appsignal.start_logger(path) }
 
         it "should log to stdout" do
+          Appsignal.start_logger
           Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
+          out_stream.string.should include 'Log something'
         end
       end
 
       context "when we're on Heroku" do
-        let(:path) { File.join(project_fixture_path, 'log') }
         before do
           ENV['DYNO'] = 'dyno1'
-          Appsignal.start_logger(path)
         end
         after { ENV.delete('DYNO') }
 
         it "should log to stdout" do
+          Appsignal.start_logger
           Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
+          out_stream.string.should include 'Log something'
         end
       end
 
       context "when we're on Shelly Cloud" do
-        let(:path) { File.join(project_fixture_path, 'log') }
         before do
           ENV['SHELLYCLOUD_DEPLOYMENT'] = 'true'
-          Appsignal.start_logger(path)
         end
         after { ENV.delete('SHELLYCLOUD_DEPLOYMENT') }
 
         it "should log to stdout" do
+          Appsignal.start_logger
           Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
+          out_stream.string.should include 'Log something'
         end
       end
 
       context "when there is no in memory log" do
         it "should not crash" do
           Appsignal.in_memory_log = nil
-          Appsignal.start_logger(nil)
+          Appsignal.start_logger
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.53
+  version: 0.12.beta.54
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack