logjam_agent 0.0.4 → 0.1.0

data/lib/logjam_agent/rack/logger.rb

@@ -0,0 +1,52 @@
+module LogjamAgent
+  module Rack
+    class Logger < ActiveSupport::LogSubscriber
+      def initialize(app)
+        @app = app
+        @hostname = Socket.gethostname
+      end
+
+      def call(env)
+        start_time = Time.now
+        before_dispatch(env, start_time)
+        result = @app.call(env)
+      ensure
+        run_time = Time.now - start_time
+        after_dispatch(env, result, run_time*1000)
+      end
+
+      protected
+
+      def before_dispatch(env, start_time)
+        TimeBandits.reset
+
+        Thread.current[:time_bandits_completed_info] = nil
+
+        request = ActionDispatch::Request.new(env)
+        path = request.filtered_path
+
+        Rails.logger.request.fields.merge!(:started_at => start_time, :ip => request.ip, :host => @hostname)
+
+        info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{start_time.to_default_s}"
+      end
+
+      def after_dispatch(env, result, run_time_ms)
+        status = result ? result.first : 500
+        duration, additions, view_time, action = Thread.current[:time_bandits_completed_info]
+
+        basic_request_info = {:total_time => run_time_ms, :code => status, :action => action, :view_time => view_time || 0.0}
+
+        message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % run_time_ms
+        message << " (#{additions.join(' | ')})" unless additions.blank?
+        info message
+
+        ActiveSupport::LogSubscriber.flush_all!
+
+        Rails.logger.request.fields.merge!(basic_request_info)
+
+        env["time_bandits.metrics"] = TimeBandits.metrics
+      end
+
+    end
+  end
+end

data/lib/logjam_agent/railtie.rb

@@ -0,0 +1,36 @@
+require 'logjam_agent'
+module LogjamAgent
+  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
+          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
+        rescue StandardError => e
+          logger = LogjamAgent::BufferedLogger.new(STDERR)
+          logger.level = ActiveSupport::BufferedLogger::WARN
+          logger.warn(
+                      "Logging Error: Unable to access log file. Please ensure that #{path} exists and is writable. " +
+                      "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+                      )
+          logger
+        end
+    end
+
+    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
+end
+

data/lib/logjam_agent/request.rb

@@ -15,7 +15,7 @@ module LogjamAgent
     end
 
     def add_line(severity, timestamp, message)
-      @lines << [severity, format_time(timestamp), message]
+      @lines << [severity, format_time(timestamp), message.strip]
     end
 
     def forward

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 +02:00
+date: 2011-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,8 @@ files:
 - lib/logjam_agent/buffered_logger.rb
 - lib/logjam_agent/forwarders.rb
 - lib/logjam_agent/middleware.rb
+- lib/logjam_agent/rack/logger.rb
+- lib/logjam_agent/railtie.rb
 - lib/logjam_agent/request.rb
 - lib/logjam_agent/syslog_like_formatter.rb
 - lib/logjam_agent/version.rb