amqp_logging 0.5.0 → 0.5.5

data/lib/amqp_logging.rb

@@ -3,15 +3,23 @@ require 'bunny'
 begin
   # ActiveSupport 3.x
   require 'active_support/time'
+  require 'active_support/core_ext/module/aliasing'
   require 'active_support/core_ext/hash/slice'
 rescue LoadError
-  require 'active_support'      # ActiveSupport 2.x
+  # ActiveSupport 2.x
+  require 'active_support'
 end
 
 module AMQPLogging
   autoload :MetricsAgent, 'amqp_logging/metrics_agent'
+
+  private
+  def self.iso_time_with_microseconds(t = Time.now)
+    t.strftime("%Y-%m-%dT%H:%M:%S.#{t.usec}")
+  end
 end
 
 require 'logger'
 require 'amqp_logging/logger'
 require 'amqp_logging/log_device'
+require 'amqp_logging/ext/qrack/client'

data/lib/amqp_logging/ext/qrack/client.rb

@@ -0,0 +1,44 @@
+require 'qrack/client'
+
+
+unless Qrack::Client.instance_methods.include?("socket_with_reliable_timeout")
+  module AMQPLogging
+    Timer = if RUBY_VERSION < "1.9"
+              begin
+                require 'system_timer'
+                SystemTimer
+              rescue LoadError
+                require 'timeout'
+                Timeout
+              end
+            else
+              require 'timeout'
+              Timeout
+            end
+  end
+
+  module Qrack
+    class Client
+      # overwrite the timeout method so that SystemTimer is used
+      # instead the standard timeout.rb: http://ph7spot.com/musings/system-timer
+      delegate :timeout, :to => AMQPLogging::Timer
+
+      def socket_with_reliable_timeout
+        socket_without_reliable_timeout
+
+        secs   = Integer(CONNECT_TIMEOUT)
+        usecs  = Integer((CONNECT_TIMEOUT - secs) * 1_000_000)
+        optval = [secs, usecs].pack("l_2")
+      
+        begin
+          @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+          @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+        rescue Errno::ENOPROTOOPT
+        end
+        @socket
+      end
+      alias_method_chain :socket, :reliable_timeout
+
+    end
+  end
+end

data/lib/amqp_logging/metrics_agent.rb

@@ -3,7 +3,9 @@ require 'json'
 
 module AMQPLogging
   class MetricsAgent
+    DEFAULT_MAX_LINES_PER_LOGGER = 1000
     attr_reader :fields
+    attr_accessor :max_lines_per_logger
 
     def initialize
       @default_fields = {
@@ -13,6 +15,7 @@ module AMQPLogging
           :default => []
         }
       }
+      @max_lines_per_logger = DEFAULT_MAX_LINES_PER_LOGGER
       @logger_types = {}
       reset_fields
     end
@@ -41,9 +44,19 @@ module AMQPLogging
     end
 
     def add_logline(severity, message, progname, logger)
-      t = Time.now
-      msg = (message || progname).strip
-      @fields[:loglines][@logger_types[logger]] << [severity, t.strftime("%Y-%d-%mT%H:%M:%S.#{t.usec}"), msg]
+      timestring = AMQPLogging.iso_time_with_microseconds
+      logtype = @logger_types[logger]
+      lines = @fields[:loglines][logtype]
+      if !@truncated_status[logtype] && lines.size < @max_lines_per_logger
+        msg = (message || progname).strip
+        lines << [severity, timestring, msg]
+        true
+      else
+        msg = "Loglines truncated to #{@max_lines_per_logger} lines (MetricsAgent#max_lines_per_logger)"
+        lines[-1] = [Logger::INFO, timestring, msg]
+        @truncated_status[logtype] = true
+        false
+      end
     end
 
     def wrap_logger(logger, type = :default)
@@ -58,6 +71,10 @@ module AMQPLogging
       logger
     end
 
+    def dirty?
+      @fields != @default_fields
+    end
+
     private
     def register_logger(logger, type)
       @logger_types[logger] = type
@@ -68,6 +85,7 @@ module AMQPLogging
       @fields = {
       }.merge!(@default_fields)
       @logger_types.values.each {|logtype| @fields[:loglines][logtype] = []}
+      @truncated_status = {}
     end
     
     module MetricsAgentSupport

data/lib/amqp_logging/metrics_agent/rails.rb

@@ -8,8 +8,7 @@ end
 class ActionController::Base
   def log_processing_for_request_id_with_metrics_agent
     logger.agent[:page] = "#{self.class.name}\##{action_name}"
-    t = Time.now
-    logger.agent[:started_at] = t.strftime("%Y-%d-%mT%H:%M:%S.#{t.usec}")
+    logger.agent[:started_at] = AMQPLogging.iso_time_with_microseconds
     log_processing_for_request_id_without_metrics_agent
   end
   alias_method_chain :log_processing_for_request_id, :metrics_agent

data/test/metrics_agent_test.rb

@@ -34,6 +34,21 @@ module AMQPLogging
       @agent.flush
       assert_equal nil, @agent[:foo]
     end
+
+    test "should keep track if the agents data is dirty" do
+      assert !@agent.dirty?
+
+      @agent[:foo] = :bar
+      assert @agent.dirty?
+    end
+
+    test "flushing should reset dirty status" do
+      @agent[:foo] = :bar
+      assert @agent.dirty?
+
+      @agent.flush
+      assert !@agent.dirty?
+    end
   end
 
   class LoggingProxyTest < Test::Unit::TestCase
@@ -104,5 +119,22 @@ module AMQPLogging
       @proxy.debug "\n\nfoo\n\n"
       assert_equal "foo", @agent[:loglines][:default][-1][2]
     end
+
+    test "should have a limit of loglines per logger after which they will get ignored" do
+      @agent.max_lines_per_logger = 2
+      @logger.debug "foo"
+      @logger.debug "bar"
+      no_lines_before = @agent[:loglines][:default].size
+      @logger.debug "baz"
+      assert_equal no_lines_before, @agent[:loglines][:default].size
+    end
+
+    test "should replace the last logged line with a truncation note if the limit of loglines is exceeded" do
+      @agent.max_lines_per_logger = 1
+      @logger.debug "foo"
+      assert_equal "foo", @agent[:loglines][:default].last[2]
+      @logger.debug "bar"
+      assert_match /truncated/, @agent[:loglines][:default].last[2]
+    end
   end
 end

data/test/test_helper.rb

@@ -4,8 +4,6 @@ require 'test/unit'
 require 'mocha'
 require 'active_support/testing/declarative'
 
-require File.expand_path(File.dirname(__FILE__) + '/../lib/amqp_logging')
-
 begin
   require 'redgreen' unless ENV['TM_FILENAME']
 rescue LoadError

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp_logging
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Pascal Friederich
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: 
 - Readme.rdoc
 files: 
+- lib/amqp_logging/ext/qrack/client.rb
 - lib/amqp_logging/log_device.rb
 - lib/amqp_logging/logger.rb
 - lib/amqp_logging/metrics_agent/rails/after_dispatch_callback_handler.rb
@@ -118,7 +119,7 @@ has_rdoc: true
 homepage: http://github.com/paukul/amqp_logging
 licenses: []
 
-post_install_message: 
+post_install_message: "  *********************************************************************************************\n\n    If you're running a ruby version < 1.9 please install the system_timer gem because rubys \n    default timeout.rb isn't reliable.\n\n    \"In particular, it is guaranteed to not work in Ruby M.R.I 1.8 when you are issuing \n     system calls that can cause your Ruby process to sleep for a period of time that is \n     longer than your timeout.\"\n\n    See: http://ph7spot.com/musings/system-timer\n\n  *********************************************************************************************\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: