logjam_agent 0.3.6 → 0.4.0

data/lib/logjam_agent/buffered_logger.rb

@@ -9,8 +9,8 @@ module LogjamAgent
 
     def initialize(*args)
       super(*args)
-      # stupid bug in the buffered logger code
-      @log.write "\n"
+      # stupid bug in the buffered logger code (Rails::VERSION::STRING < "3.2")
+      @log.write "\n" if respond_to?(:buffer)
       @formatter = lambda{|_, _, _, message| message}
     end
 
@@ -47,15 +47,27 @@ module LogjamAgent
         end
       end
       time = Time.now
-      buffer << formatter.call(severity, time, progname, message) << "\n"
-      auto_flush
+      formatted_message = formatter.call(severity, time, progname, message)
+      if respond_to?(:buffer)
+        buffer <<  formatted_message << "\n"
+        auto_flush
+      else # @log is a logger
+        @log << "#{formatted_message}\n"
+      end
       request.add_line(severity, time, message) if request
       message
     end
 
     def logdev=(log_device)
       raise "cannot connect logger to new log device" unless log_device.respond_to?(:write)
-      @log = log_device
+      if respond_to?(:buffer)
+        @log = log_device
+      else
+        @log.instance_eval do
+          raise "cannot set log device" unless defined?(@logdev)
+          @logdev = log_device
+        end
+      end
     end
 
     private

data/lib/logjam_agent/railtie.rb

@@ -1,14 +1,21 @@
 require 'logjam_agent'
 module LogjamAgent
+
+  module Rack
+    autoload :Logger, 'logjam_agent/rack/logger'
+  end
+  autoload :Middleware, 'logjam_agent/middleware'
+
   class Railtie < Rails::Railtie
 
     initializer "initialize_logjam_agent_logger", :before => :initialize_logger do |app|
       Rails.logger ||= app.config.logger ||
         begin
-          path = app.config.paths.log.to_a.first
+          paths = app.config.paths
+          path = (paths.respond_to?(:log) ? paths.log.to_a : paths['log']).first.to_s
           logger = LogjamAgent::BufferedLogger.new(path)
           logger.level = ActiveSupport::BufferedLogger.const_get(app.config.log_level.to_s.upcase)
-          logger.auto_flushing = false if Rails.env.production?
+          logger.auto_flushing = false if Rails.env.production? && Rails::VERSION::STRING < "3.2"
           logger
         rescue StandardError => e
           logger = LogjamAgent::BufferedLogger.new(STDERR)
@@ -24,11 +31,6 @@ module LogjamAgent
     initializer "logjam_agent", :after => "time_bandits" do |app|
       app.config.middleware.swap("TimeBandits::Rack::Logger", "LogjamAgent::Rack::Logger")
       app.config.middleware.insert_before("LogjamAgent::Rack::Logger", "LogjamAgent::Middleware")
-
-      ActiveSupport.on_load(:action_controller) do
-        require 'logjam_agent/middleware.rb'
-        require 'logjam_agent/rack/logger.rb'
-      end
     end
 
   end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 Z
+date: 2012-04-05 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -116,6 +117,7 @@ files:
 - lib/logjam_agent/version.rb
 - logjam_agent.gemspec
 - rails/init.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: logjam_agent
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Logjam client library to be used with logjam