syslogger 1.6.0 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28b700c9de11a93cefdb98ca53a92bf2499a0c74
+  data.tar.gz: 5c11451c3ec8745595fe0a85e0d9cd5423bef221
+SHA512:
+  metadata.gz: 33b809d97e51893468e8a5679a2bf74d69d4bb8829662090aa0439a2f6eeebdcf8bed7baa8c34b7143a985390f8442ff94974b84610ae7c5fbb6b045e4b884ea
+  data.tar.gz: 412a3de21a03b23978d38ce2ddaa74aa15f0901129a468594afd591bd0b66a5e7d3bca329753a34352db8de955d10c25ae93fd1ded0583a17f12539ff970c2a9

data/lib/syslogger.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 class Syslogger
 
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 
   attr_reader :level, :ident, :options, :facility, :max_octets
   attr_accessor :formatter
@@ -47,7 +47,9 @@ class Syslogger
     @facility = facility
     @level = Logger::INFO
     @mutex = Mutex.new
-    @formatter = Logger::Formatter.new
+    @formatter = proc do |severity, datetime, progname, msg|
+      msg
+    end
   end
 
   %w{debug info warn error fatal unknown}.each do |logger_method|
@@ -92,9 +94,10 @@ class Syslogger
       Syslog.open(progname, @options, @facility) do |s|
         s.mask = Syslog::LOG_UPTO(MAPPING[@level])
         communication = clean(message || block && block.call)
+        formatted_communication = formatter.call([severity], Time.now, progname, communication)
         if self.max_octets
-          buffer = ""
-          communication.bytes do |byte|
+          buffer = "#{tags_text}"
+          formatted_communication.bytes do |byte|
             buffer.concat(byte)
             # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte
             if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte)
@@ -104,7 +107,7 @@ class Syslogger
           end
           s.log(MAPPING[severity],buffer) unless buffer.empty?
         else
-          s.log(MAPPING[severity],communication)
+          s.log(MAPPING[severity],"#{tags_text}#{formatted_communication}")
         end
       end
     end
@@ -132,6 +135,28 @@ class Syslogger
     @ident = ident
   end
 
+  # Tagging code borrowed from ActiveSupport gem
+  def tagged(*tags)
+    new_tags = push_tags(*tags)
+    yield self
+  ensure
+    pop_tags(new_tags.size)
+  end
+
+  def push_tags(*tags)
+    tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags|
+      current_tags.concat new_tags
+    end
+  end
+
+  def pop_tags(size = 1)
+    current_tags.pop size
+  end
+
+  def clear_tags!
+    current_tags.clear
+  end
+
   protected
 
   # Borrowed from SyslogLogger.
@@ -143,4 +168,17 @@ class Syslogger
     message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
     message
   end
+
+  private
+
+  def tags_text
+    tags = current_tags
+    if tags.any?
+      tags.collect { |tag| "[#{tag}] " }.join
+    end
+  end
+
+  def current_tags
+    Thread.current[:syslogger_tagged_logging_tags] ||= []
+  end
 end

data/spec/syslogger_spec.rb

@@ -170,6 +170,15 @@ describe "Syslogger" do
       syslog.should_receive(:log).with(Syslog::LOG_INFO, "a"*480).twice
       @logger.add(Logger::INFO, "a"*960)
     end
+
+    it "should apply the log formatter to the message" do
+      Syslog.stub(:open).and_yield(syslog=double("syslog", :mask= => true))
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "test message!")
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "test #{msg}!"
+      end
+      @logger.add(Logger::INFO, "message")
+    end
   end # describe "add"
 
   describe "max_octets=" do

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: syslogger
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Same as SyslogLogger, but without the ridiculous number of dependencies
@@ -67,36 +60,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.rdoc
+- Rakefile
 - lib/syslogger.rb
 - spec/spec_helper.rb
 - spec/syslogger_spec.rb
-- Rakefile
-- LICENSE
-- README.rdoc
 homepage: http://github.com/crohr/syslogger
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dead simple Ruby Syslog logger
 test_files:
 - spec/spec_helper.rb