logjam_agent 0.6.7 → 0.6.8

data/lib/logjam_agent/rack/logger.rb

@@ -121,22 +121,65 @@ 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?
+    if Rails::VERSION::STRING =~ /^3.0/
+      def start_processing(event)
+        payload = event.payload
+        params  = payload[:params].except(*INTERNAL_PARAMS)
+
+        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 #{payload[:formats].first.to_s.upcase}"
+        info "  Parameters: #{params.inspect}" unless params.empty?
+      end
+
+    elsif Rails::VERSION::STRING =~ /^3.1/
+
+      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
+
+    elsif Rails::VERSION::STRING =~ /^3.2/
+
+      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
+
+    else
+      raise "loggjam_agent ActionController monkey patch is not compatible with your Rails version"
     end
   end
 

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-13 00:00:00 Z
+date: 2013-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake