logjam_agent 0.7.3 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2EwNGYwYTRhN2YzZDAwYTE0YjJiOTcwYTQ4NWJmNGM0MmM2NjM0OQ==
+    YTkzZmVmY2Q4NDkxNzQwNmNhYWRmMzBjOTQ3YmJlYWRhNzU4ZjQ0Yg==
   data.tar.gz: !binary |-
-    OTFmNzM1ZWI4MjcwOTRhYWI2ZDYwNWU4YmYzMjlkOTMwYjg4NTU4NA==
+    NTdjOTg3MGQ5MTI0NWVmN2RlYjllMTViZTVkOWNjNzUzM2E5Njg0Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDEwODU1ZjdlMjEwNjg3MDU1ZDhhYzVlY2ZkYmE3ZWQ0ZTUxNjU4MzYwMDk2
-    MTVjYTA0ZGY0YjdmYThjMDVkZjk1YWQxNWU0ZDRhNzVjZmY5NmZkMDBmMjg0
-    MzEwNTNjZDkwZTI1NWNmMDE4OTljYWMwNjc5MDRhOTkwMWJlMjA=
+    YjE2YWMxZGY0N2RmNjcxMTliYzg1NDdjNTU2N2U3MDFmYzljYWU5YmJhNzcy
+    YWM4MjhjZmYwOTg5NDZhNWM1OTk0ZWRhZjY1YzlkZmQwOTM3ZDZkYzUwNDU1
+    OGNhMDMxNmM1MmM1NDhhYTczNTc3NmI3ZjQyZmRhYzNmMTlkZjM=
   data.tar.gz: !binary |-
-    ZGJmZTA1OTE4MjI2NzU1OTU0Zjk0NzUxNDZlOWU5ZWNmYmMwNmFlMDc4ZmY0
-    ODAxNTQyNjhiY2VkNTliNzU1ZDliYzUxODAxNmFkYjMyM2Y0MzFkNzQ1YzVi
-    NDQ5MDJlNDdiMjkyYWU1NDVjODJmMTM4ZTFiN2Y0YWUzYjA4OWE=
+    MzdjMDlmZTRiM2FmY2Y4MTFjMTM0ZmFjMjdjZjRjNWQwNTkzOTE4YTgwNzgy
+    YWVhZDUzYmMzNmU1MmU0ZjU1NDk2ZmQwMjgxOTg1YTQ1ZDgwMzg3YTRjODdm
+    MjUyM2RmZWZkMzUzZTg2ZTUwOGUyM2I4ZjQ1ZTNiNTc2MWQzNWY=

data/lib/logjam_agent.rb

@@ -2,6 +2,30 @@ require "socket"
 require "uuid4r"
 require "time_bandits"
 
+module LogjamAgent
+  module RequestHandling
+    def request
+      Thread.current.thread_variable_get(:logjam_request)
+    end
+
+    def request=(request)
+      Thread.current.thread_variable_set(:logjam_request, request)
+    end
+
+    def start_request(app = LogjamAgent.application_name, env = LogjamAgent.environment_name, initial_fields = {})
+      self.request = Request.new(app, env, initial_fields)
+    end
+
+    def finish_request(additional_fields = {})
+      if request = self.request
+        request.fields.merge!(additional_fields)
+        self.request = nil
+        request.forward
+      end
+    end
+  end
+end
+
 require "logjam_agent/version"
 require "logjam_agent/amqp_forwarder"
 require "logjam_agent/zmq_forwarder"
@@ -18,6 +42,9 @@ module LogjamAgent
 
   class ForwardingError < StandardError; end
 
+  mattr_accessor :logger
+  self.logger = nil
+
   mattr_accessor :error_handler
   self.error_handler = lambda { |exception| }
 
@@ -53,6 +80,8 @@ module LogjamAgent
   mattr_accessor :disabled
   self.disabled = false
 
+  extend RequestHandling
+
   mattr_accessor :exception_classes
   self.exception_classes = []
 

data/lib/logjam_agent/buffered_logger.rb

@@ -52,6 +52,9 @@ module LogjamAgent
 
     attr_accessor :formatter
 
+    # for backwards compatibility. needs to go away.
+    include LogjamAgent::RequestHandling
+
     def initialize(*args)
       super(*args)
       # stupid bug in the buffered logger code (Rails::VERSION::STRING < "3.2")
@@ -59,32 +62,12 @@ module LogjamAgent
       @formatter = lambda{|_, _, _, message| message}
     end
 
-    def request
-      Thread.current.thread_variable_get(:logjam_request)
-    end
-
-    def request=(request)
-      Thread.current.thread_variable_set(:logjam_request, request)
-    end
-
-    def start_request(app, env, initial_fields={})
-      self.request = Request.new(app, env, self, initial_fields)
-    end
-
-    def finish_request(additional_fields={})
-      if request = self.request
-        request.fields.merge!(additional_fields)
-        self.request = nil
-        request.forward
-      end
-    end
-
     def add(severity, message = nil, progname = nil, tags_text = nil, &block)
       return if level > severity
       message = progname if message.nil?
       progname = nil
       message ||= block.call || '' if block
-      request = self.request || Thread.main.thread_variable_get(:logjam_request)
+      request = LogjamAgent.request
       if message.is_a?(Exception)
         request.add_exception(message.class.to_s) if request
         message = format_exception(message)

data/lib/logjam_agent/middleware.rb

@@ -28,11 +28,11 @@ module LogjamAgent
       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)
+      LogjamAgent.start_request(app_name, env_name, :caller_id => caller_id, :caller_action => caller_action)
     end
 
     def finish_request(env)
-      Rails.logger.finish_request(env["time_bandits.metrics"])
+      LogjamAgent.finish_request(env["time_bandits.metrics"])
     end
   end
 end

data/lib/logjam_agent/rack/logger.rb

@@ -35,7 +35,7 @@ module LogjamAgent
         @taggers.collect do |tag|
           case tag
           when :uuid
-            Rails.logger.request.uuid
+            LogjamAgent.request.uuid
           when Proc
             tag.call(request)
           when Symbol
@@ -52,7 +52,7 @@ module LogjamAgent
 
         path = request.filtered_path
 
-        logjam_fields = Rails.logger.request.fields
+        logjam_fields = LogjamAgent.request.fields
         logjam_fields.merge!(:started_at => start_time.iso8601, :ip => request.remote_ip, :host => @hostname)
         logjam_fields.merge!(extract_request_info(request))
 
@@ -77,7 +77,7 @@ module LogjamAgent
 
         ActiveSupport::LogSubscriber.flush_all!
 
-        Rails.logger.request.fields.merge!(request_info)
+        LogjamAgent.request.fields.merge!(request_info)
 
         env["time_bandits.metrics"] = TimeBandits.metrics
       end
@@ -163,7 +163,7 @@ module ActionController #:nodoc:
         full_name = "#{controller}##{action}"
         action_name = LogjamAgent.action_name_proc.call(full_name)
 
-        Rails.logger.request.fields[:action] = action_name
+        LogjamAgent.request.fields[:action] = action_name
 
         info "  Processing by #{full_name} as #{payload[:formats].first.to_s.upcase}"
         info "  Parameters: #{params.inspect}" unless params.empty?
@@ -182,7 +182,7 @@ module ActionController #:nodoc:
         full_name = "#{controller}##{action}"
         action_name = LogjamAgent.action_name_proc.call(full_name)
 
-        Rails.logger.request.fields[:action] = action_name
+        LogjamAgent.request.fields[:action] = action_name
 
         info "  Processing by #{full_name} as #{format}"
         info "  Parameters: #{params.inspect}" unless params.empty?
@@ -201,7 +201,7 @@ module ActionController #:nodoc:
         full_name = "#{controller}##{action}"
         action_name = LogjamAgent.action_name_proc.call(full_name)
 
-        Rails.logger.request.fields[:action] = action_name
+        LogjamAgent.request.fields[:action] = action_name
 
         info "Processing by #{full_name} as #{format}"
         info "  Parameters: #{params.inspect}" unless params.empty?

data/lib/logjam_agent/railtie.rb

@@ -19,10 +19,12 @@ module LogjamAgent
           logger.formatter = LogjamAgent::SyslogLikeFormatter.new
           logger.auto_flushing = false if Rails.env.production? && Rails::VERSION::STRING < "3.2"
           logger = ActiveSupport::TaggedLogging.new(logger) if Rails::VERSION::STRING >= "3.2"
+          LogjamAgent.logger = logger
           logger
         rescue StandardError
           logger = LogjamAgent::BufferedLogger.new(STDERR)
           logger = ActiveSupport::TaggedLogging.new(logger) if Rails::VERSION::STRING >= "3.2"
+          LogjamAgent.logger = logger
           logger.level = ::Logger::WARN
           logger.warn(
                       "Logging Error: Unable to access log file. Please ensure that #{path} exists and is writable. " +
@@ -38,6 +40,22 @@ 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")
+
+      # patch controller testing to create a logjam request, because middlewares aren't executed
+      if Rails.env.test?
+        ActiveSupport.on_load(:action_controller) do
+          require 'action_controller/test_case'
+          module ActionController::TestCase::Behavior
+            def process_with_logjam(*args)
+              LogjamAgent.start_request
+              process_without_logjam(*args)
+            ensure
+              LogjamAgent.finish_request
+            end
+            alias_method_chain :process, :logjam
+          end
+        end
+      end
     end
 
     # make
@@ -53,6 +71,7 @@ module LogjamAgent
         end
       EVA
     end
+
   end
 end
 

data/lib/logjam_agent/request.rb

@@ -8,8 +8,7 @@ module LogjamAgent
   class Request
     attr_reader :fields, :uuid
 
-    def initialize(app, env, logger, initial_fields)
-      @logger = logger
+    def initialize(app, env, initial_fields)
       @app = app
       @env = env
       @forwarder = Forwarders.get(app, env)
@@ -63,7 +62,7 @@ module LogjamAgent
     end
 
     def handle_forwarding_error(exception)
-      @logger.error exception.to_s
+      LogjamAgent.logger.error exception.to_s if LogjamAgent.logger
       LogjamAgent.error_handler.call(exception)
     rescue Exception
       # swallow all exceptions

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement