logjam_agent 0.6.5 → 0.6.6

data/lib/logjam_agent/middleware.rb

@@ -22,10 +22,11 @@ module LogjamAgent
     private
 
     def start_request(env)
-      app_name  = env["logjam_agent.application_name"] || LogjamAgent.application_name
-      env_name  = env["logjam_agent.environment_name"] || LogjamAgent.environment_name
-      caller_id = env["HTTP_X_LOGJAM_CALLER_ID"] || ""
-      Rails.logger.start_request(app_name, env_name, :caller_id => caller_id)
+      app_name      = env["logjam_agent.application_name"] || LogjamAgent.application_name
+      env_name      = env["logjam_agent.environment_name"] || LogjamAgent.environment_name
+      caller_id     = env["HTTP_X_LOGJAM_CALLER_ID"] || ""
+      caller_action = env["HTTP_X_LOGJAM_ACTION"] || ""
+      Rails.logger.start_request(app_name, env_name, :caller_id => caller_id, :caller_action => caller_action)
     end
 
     def finish_request(env)

data/lib/logjam_agent/rack/logger.rb

@@ -35,10 +35,9 @@ module LogjamAgent
 
       def after_dispatch(env, result, run_time_ms)
         status = result ? result.first : 500
-        duration, additions, view_time, action = Thread.current.thread_variable_get(:time_bandits_completed_info)
+        _, additions, view_time, _ = Thread.current.thread_variable_get(:time_bandits_completed_info)
 
-        action_name = LogjamAgent.action_name_proc.call(action)
-        request_info = {:total_time => run_time_ms, :code => status, :action => action_name, :view_time => view_time || 0.0}
+        request_info = {:total_time => run_time_ms, :code => status, :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?
@@ -114,3 +113,31 @@ module LogjamAgent
     end
   end
 end
+
+# patch the actioncontroller logsubscriber to set the action on the logjam logger as soon as it starts processing the request
+require 'action_controller/metal/instrumentation'
+require 'action_controller/log_subscriber'
+
+module ActionController #:nodoc:
+
+  class LogSubscriber
+    def start_processing(event)
+      payload = event.payload
+      params  = payload[:params].except(*INTERNAL_PARAMS)
+      format  = payload[:format]
+      format  = format.to_s.upcase if format.is_a?(Symbol)
+
+      controller = payload[:controller]
+      action = payload[:action]
+      full_name = "#{controller}##{action}"
+      action_name = LogjamAgent.action_name_proc.call(full_name)
+
+      # puts "setting logjam action to #{action_name}"
+      Rails.logger.request.fields[:action] = action_name
+
+      info "Processing by #{full_name} as #{format}"
+      info "  Parameters: #{params.inspect}" unless params.empty?
+    end
+  end
+
+end

data/lib/logjam_agent/request.rb

@@ -6,7 +6,7 @@ end
 
 module LogjamAgent
   class Request
-    attr_reader :caller_id, :fields
+    attr_reader :fields
 
     def initialize(app, env, logger, initial_fields)
       @logger = logger
@@ -27,6 +27,10 @@ module LogjamAgent
       @fields[:caller_id]
     end
 
+    def caller_action
+      @fields[:caller_action]
+    end
+
     def add_line(severity, timestamp, message)
       @mutex.synchronize do
         @lines << [severity, format_time(timestamp), message.strip]

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-12 00:00:00 Z
+date: 2013-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake