appsignal 0.7.0.alpha.1 → 0.7.0.alpha.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJjZmJmYThiYzQxNmNkYmY3OTljN2M4MzE3ZmI2NTJiNWExM2QyZA==
+    NWZmZGFhYzgyNmJhNzg3Y2Y5MGY3ODdmNzgzOGZhOGY1ZmNjOTY1NA==
   data.tar.gz: !binary |-
-    MDdlY2ZlZDlhN2FlN2Q4MDI0Nzg0NDFiODdmMDAxODRlYjI4NjQwMA==
+    NGJmNDhlYzA5MDc3Njg2NjczMDdhNGY2MGQ4YzA3NTE5MGRkMzA1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjQxMWVmNmI4NThmYzdmMDQ3ZDM1YzNkODAwYTZjNWY2NTJlNzNlNzQzNDRk
-    NGVkYzQwYWZiOGZmN2ZiN2ExMGJhODRmMmFhNGY3N2M0M2VkNjQxNzRiZmRk
-    MmJlMjFmYmRjMmU4NWI0YWNmZDk3NjY0MThkYzVjMDE3MjRjMmE=
+    M2Y0NDM0OThjYTA5MDkwMDYxYzBmNDg0NjU4NzRkMDZjNTBhNTAwNWU0ZTQ4
+    ZTY1ZDFjZGYzMWQ0MjI4ZDEyZWE1OGI0NjY1NmEyYzdmYmM1NWE0Mjc4YmNm
+    MmM1NThkMDI0N2MxMDlhYzc2MzVlNTY2NzUyZTQwYzBmMDhkMGY=
   data.tar.gz: !binary |-
-    ZDUwNTQ3ZGQyZmUwMmQ1OWE1YzcxNTQ4NzNkYWJjNDUwZmQ0OGEyMDY2ODgy
-    NDExNWQyMGRlZjc3MTMwMzk1MjFkYTdkMzBkZDNjOTNiNTI2YTEyNzdiMWEz
-    NWMzYzY2MTkyMjg2YzY0NDVmNjBmOTM3ZDkwZjU3ZGNjYmY1MTQ=
+    NTNkOTQ2ZjEyOWRjZDljYTMyNGQ5YTcxZWIzZTJmNjhkNTgzMjIxOTU5Zjgz
+    YzI5YTkxMDllZGZmMmQ4YzYzZWJmODViNjc3N2FiZjZhMzQ1NzI1YTljY2Mx
+    ZWVmMWZkYmU0MWMwMGM0MDkzMTNlMzcyNjYwMGU1NzI3NzI2NWQ=

data/CHANGELOG.md

@@ -3,6 +3,7 @@
 * New easier onboarding process
 * Support for Rack apps, including experimental Sinatra integration
 * Monitor HTTP queue times
+* Always log to stdout on Heroku
 
 # 0.6.7
 * Send HTTP_X_FORWARDED_FOR env var

data/lib/appsignal.rb

@@ -72,8 +72,15 @@ module Appsignal
       end
     end
 
-    def flush_in_memory_log
-      Appsignal.logger << @in_memory_log.string
+    def start_logger(path)
+      if path && File.writable?(path) && !ENV['DYNO']
+        @logger = Logger.new(File.join(path, 'appsignal.log'))
+        @logger.formatter = Logger::Formatter.new
+      else
+        @logger = Logger.new($stdout)
+      end
+      @logger.level = Logger::INFO
+      @logger << @in_memory_log.string
     end
 
     def json

data/lib/appsignal/integrations/rails.rb

@@ -10,16 +10,8 @@ if defined?(::Rails)
         end
 
         config.after_initialize do
-          # Setup logging
-          if File.writable?(Rails.root.join('log'))
-            output = Rails.root.join('log/appsignal.log')
-          else
-            output = STDOUT
-          end
-          Appsignal.logger = Logger.new(output).tap do |l|
-            l.level = Logger::INFO
-          end
-          Appsignal.flush_in_memory_log
+          # Start logger
+          Appsignal.start_logger(Rails.root.join('log'))
 
           # Load config
           Appsignal.config = Appsignal::Config.new(Rails.root, Rails.env)

data/lib/appsignal/integrations/sinatra.rb

@@ -8,10 +8,7 @@ Appsignal.config = Appsignal::Config.new(
   app_settings.environment.to_s
 )
 
-Appsignal.logger = Logger.new(File.join(app_settings.root, 'appsignal.log')).tap do |l|
-  l.level = Logger::DEBUG
-end
-Appsignal.flush_in_memory_log
+Appsignal.start_logger(app_settings.root)
 
 if Appsignal.active?
   Appsignal.start

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.7.0.alpha.1'
+  VERSION = '0.7.0.alpha.2'
 end

data/spec/lib/appsignal/cli_spec.rb

@@ -3,18 +3,16 @@ require 'appsignal/cli'
 
 describe Appsignal::CLI do
   let(:out_stream) { StringIO.new }
-  let(:error_stream) { StringIO.new }
   let(:cli) { Appsignal::CLI }
   before do
-    @original_stdout, @original_stderr = $stdout, $stderr
-    $stdout, $stderr = out_stream, error_stream
+    @original_stdout = $stdout
+    $stdout = out_stream
     ENV['PWD'] = project_fixture_path
     cli.config = nil
     cli.options = {:environment => 'production'}
   end
-  after :each do
+  after do
     $stdout = @original_stdout
-    $stderr = @original_stderr
   end
 
   describe "#logger" do

data/spec/lib/appsignal_spec.rb

@@ -122,6 +122,51 @@ describe Appsignal do
       it { should be_a Logger }
     end
 
+    describe ".start_logger" do
+      let(:out_stream) { StringIO.new }
+      let(:log_file) { File.join(path, 'appsignal.log') }
+      before do
+        @original_stdout = $stdout
+        $stdout = out_stream
+        Appsignal.logger.error('Log something')
+      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
+          File.exists?(log_file).should be_true
+          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
+          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
+          out_stream.string.should include 'Log something'
+        end
+      end
+    end
+
     describe '.config' do
       subject { Appsignal.config }
 

data/spec/spec_helper.rb

@@ -40,4 +40,9 @@ RSpec.configure do |config|
     ENV.delete('APPSIGNAL_PUSH_API_KEY')
     ENV.delete('APPSIGNAL_API_KEY')
   end
+
+  config.after do
+    FileUtils.rm_f(File.join(project_fixture_path, 'log/appsignal.log'))
+    Appsignal.logger = nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.1
+  version: 0.7.0.alpha.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport