lapine 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9e189850c444c60fc06be5f3054c162b518c81
-  data.tar.gz: 42e8387e0ea8d7928774149fda5be0c3710ffc05
+  metadata.gz: 1001cd5da440647b8239d6707856cc5cc9beece5
+  data.tar.gz: a96e6b8872ac1d2c97be49276f7f6e5b4e74eab1
 SHA512:
-  metadata.gz: 92b0b5edbc3bb1babdaf4d24a1dd3d50fe11233add45c8b5fcb6e0d97c9baf83a7e8510db06a948f6dd70dc9b1c788a643d6f0c2c4fafdd0160c6e24c50c039f
-  data.tar.gz: 3078a27dd0766c1af133801e4eb82f957847f099615221bcb8745cb17524cbc7b73334584fcc65fd7f19a62009f8ef35a44062b9bacdff3bd82ccb7cdc19ef9f
+  metadata.gz: 53c391e0bd380251371e3d34aa15eae90f487f2bcd916e01b10a48a2c20c1aa292dd57581ef69309fe2d2a93f489e1827a78a3e24ac2f072ff1ee97b15bcec33
+  data.tar.gz: f697bc707ed1cb0d60829610e5f2c3d78179532f30188f02ade417b94ccfbb1d3bf9977f7cb5d2140538d0142144a54f8d62e6d38d55fce22429088ba4095d5b

data/lib/lapine/annotated_logger.rb

@@ -1,14 +1,16 @@
-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)
+require 'logger'
+module Lapine
+  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'}
+    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 initialize *args
+      super *args
+      [:info, :debug, :warn, :error, :fatal].each { |m|
+        AnnotatedLogger.class_eval %Q!
       def #{m} arg=nil, &block
         level = "#{m}"
         pid = "%.5d:" % $$
@@ -22,49 +24,50 @@ class AnnotatedLogger < Logger
         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
+    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]
 
-    format_string << "%s"
-    format_values << [out]
-    format_values.flatten!
+      if self.log_method_caller
+        file, line, method = caller_method
+        format_string << "|%-40.40s "
+        format_values << "#{File.basename(file)}:#{line}:#{method}"
+      end
 
-    format_string % format_values
-  end
+      format_string << "%s"
+      format_values << [out]
+      format_values.flatten!
 
-  def caller_method
-    parse_caller(caller(3).first)
-  end
+      format_string % format_values
+    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]
+    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
 end

data/lib/lapine/consumer/runner.rb

@@ -61,7 +61,7 @@ module Lapine
       end
 
       def logger
-        @logger ||= config.logfile ? AnnotatedLogger.new(config.logfile) : AnnotatedLogger.new(STDOUT)
+        @logger ||= config.logfile ? ::Lapine::AnnotatedLogger.new(config.logfile) : ::Lapine::AnnotatedLogger.new(STDOUT)
       end
 
       def queue_properties

data/lib/lapine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp