lapine 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e5e020daab22750edbe3723c2fa8e1176f306b
-  data.tar.gz: 5af0be7890edbb6b86c5721f53ddcda39cf74c1f
+  metadata.gz: df9e189850c444c60fc06be5f3054c162b518c81
+  data.tar.gz: 42e8387e0ea8d7928774149fda5be0c3710ffc05
 SHA512:
-  metadata.gz: 6b4b37ad82d0ef7ffd18d52c8b5b0199815c9d99aa39d3fbc7bfea39427e1634c93294002d45f567580b0fc76a9648ae33238e17b8400e61b34f1cf5fb34c9e5
-  data.tar.gz: 37379a5f8219d9eb3a043854f0c9723a552d5fbfdd999d4a0e5fd2f2988ccd42bd176e7108e78fe25381116753c394ca028d06424408237dfd783813aeaad01a
+  metadata.gz: 92b0b5edbc3bb1babdaf4d24a1dd3d50fe11233add45c8b5fcb6e0d97c9baf83a7e8510db06a948f6dd70dc9b1c788a643d6f0c2c4fafdd0160c6e24c50c039f
+  data.tar.gz: 3078a27dd0766c1af133801e4eb82f957847f099615221bcb8745cb17524cbc7b73334584fcc65fd7f19a62009f8ef35a44062b9bacdff3bd82ccb7cdc19ef9f

data/lib/lapine.rb

@@ -2,6 +2,7 @@ require 'lapine/version'
 require 'lapine/configuration'
 require 'lapine/exchange'
 require 'lapine/publisher'
+require 'lapine/annotated_logger'
 
 module Lapine
   class UndefinedConnection < StandardError; end

data/lib/lapine/annotated_logger.rb

@@ -0,0 +1,70 @@
+class AnnotatedLogger < Logger
+  attr_accessor :log_method_caller    # if set will log ruby method name substring from where logging is called
+  attr_accessor :log_timestamps       # if set will log timestamps up to millisecond
+  attr_accessor :colorize_logging     # if set turns on colors (hint: turn off in production)
+
+  NUMBER_TO_COLOR_MAP = {"debug"=>'0;37', "info"=>'32', "warn"=>'33', "error"=>'31', "fatal"=>'31', "unknown"=>'37'}
+
+  def initialize *args
+    super *args
+    [:info, :debug, :warn, :error, :fatal].each { |m|
+      AnnotatedLogger.class_eval %Q!
+      def #{m} arg=nil, &block
+        level = "#{m}"
+        pid = "%.5d:" % $$
+        if block_given?
+          arg = yield
+        end
+        out = arg
+        out = out.gsub(/\n/, ' ') unless (level == "fatal" || out =~ /\\w+\\.rb:\\d+:in/m)
+        t = Time.now
+        l = log_message(t, pid, level, out)
+        super(l) if l
+      end
+      !
+    }
+  end
+
+  def log_message(t, pid, level, out)
+    color_on = color_off = sql_color_on = ""
+    if self.colorize_logging
+      color = NUMBER_TO_COLOR_MAP[level.to_s]
+      color_on = "\033[#{color}m"
+      sql_color_on = "\033[34m"
+      color_off = "\033[0m"
+    end
+    format_string = ""
+    format_values = []
+    if self.log_timestamps
+      format_string << "%s.%03d "
+      format_values << [t.strftime("%Y-%m-%d %H:%M:%S"), t.usec / 1000]
+    end
+    format_string << "%s #{color_on}%6.6s#{color_off} "
+    format_values << [pid, level]
+
+    if self.log_method_caller
+      file, line, method = caller_method
+      format_string <<  "|%-40.40s "
+      format_values << "#{File.basename(file)}:#{line}:#{method}"
+    end
+
+    format_string << "%s"
+    format_values << [out]
+    format_values.flatten!
+
+    format_string % format_values
+  end
+
+  def caller_method
+    parse_caller(caller(3).first)
+  end
+
+  def parse_caller(at)
+    if /^(.+?):(\d+)(?::in `(.*)')?/ =~ at
+      file = Regexp.last_match[1]
+      line = Regexp.last_match[2].to_i
+      method = Regexp.last_match[3]
+      [file, line, method]
+    end
+  end
+end

data/lib/lapine/consumer/runner.rb

@@ -1,7 +1,7 @@
 require 'amqp'
 require 'digest'
 require 'eventmachine'
-require 'logger'
+require 'lapine/annotated_logger'
 require 'lapine/consumer/config'
 require 'lapine/consumer/connection'
 require 'lapine/consumer/environment'
@@ -16,6 +16,7 @@ module Lapine
       def initialize(argv)
         @argv = argv
         @message_count = 0
+        @running_message_count = 0
       end
 
       def run
@@ -32,15 +33,17 @@ module Lapine
                 Lapine::Consumer::Dispatcher.new(clazz, payload, metadata, logger).dispatch
               end
 
-              @message_count += 1 if config.debug?
-
+              if config.debug?
+                @message_count += 1
+                @running_message_count += 1
+              end
               metadata.ack
             end
           end
 
           if config.debug?
             EventMachine.add_periodic_timer(10) do
-              logger.info "Lapine::Consumer messages processed=#{@message_count}"
+              logger.info "Lapine::Consumer messages processed=#{@message_count} running_count=#{@running_message_count}"
               @message_count = 0
             end
           end
@@ -58,7 +61,7 @@ module Lapine
       end
 
       def logger
-        @logger ||= config.logfile ? Logger.new(config.logfile) : Logger.new(STDOUT)
+        @logger ||= config.logfile ? AnnotatedLogger.new(config.logfile) : AnnotatedLogger.new(STDOUT)
       end
 
       def queue_properties

data/lib/lapine/version.rb

@@ -1,3 +1,3 @@
 module Lapine
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/spec/lib/lapine/consumer/runner_spec.rb

@@ -27,8 +27,14 @@ RSpec.describe Lapine::Consumer::Runner do
     ]
   end
 
+  after :each do
+    # Comment this out to see the log in the top level folder.
+    `rm -f #{logfile}`
+  end
+
+  let(:logfile) { File.expand_path('../../../../../lapine.log', __FILE__) }
   let(:config) { double('config',
-    logfile: '/dev/null',
+    logfile: logfile,
     yaml_config: 'fakefil',
     connection_properties: connection_properties,
     require: [],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -172,6 +172,7 @@ files:
 - example/producer.rb
 - lapine.gemspec
 - lib/lapine.rb
+- lib/lapine/annotated_logger.rb
 - lib/lapine/cli.rb
 - lib/lapine/configuration.rb
 - lib/lapine/consumer.rb
@@ -232,3 +233,4 @@ test_files:
 - spec/lib/lapine_spec.rb
 - spec/spec_helper.rb
 - spec/support/rspec_test_helper.rb
+has_rdoc: