syslogger 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d44b66d0d0f21132b492ac60cca50af4b3af74
-  data.tar.gz: f352bce8e245b7a0766c8f487f1b90cffd1c7aac
+  metadata.gz: c21391ce1c6dd9acb99edabd4dcd73a730ddb6c9
+  data.tar.gz: 94d556ab7bd1569c0eae7162a2541d9f27aeb6a1
 SHA512:
-  metadata.gz: 561f991cf10f575fbcc79780af70ef52f586895ce0aa232d1405ddb957cb9b17847d41b8d02b31108700670ca62ed917a74d4b18567f90f5bd7d6033c447f93e
-  data.tar.gz: 37c03b6e2241578271de3027587fe06a96c938a0b540a04882c6de58af3b9220964179cd033c38489b9d340cda977dd16e79396f3536ba7c2ceb7510719349f5
+  metadata.gz: 6abc0fcc0946fd0950a492b9a09b071d0636b1ebaaca8a5b9e73bf5cdd05589b25bd202b46f6842f222390d20a3e8a59d5b7ae170b6100ef279a43db798c18fc
+  data.tar.gz: 716670a2a752274f51874823618bec6874bbf832c14b82a1f51ba13afe7e431948d183cfd3897afce404d97e0d4f5f360dc1a9439f4d02c1d5dba0bffe615658

data/lib/syslogger.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 class Syslogger
 
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
   
   MUTEX = Mutex.new
 
@@ -92,8 +92,8 @@ class Syslogger
     end
     progname ||= @ident
     mask = Syslog::LOG_UPTO(MAPPING[@level])
-    communication = clean(message || block && block.call)
-    formatted_communication = formatter.call([severity], Time.now, progname, communication)
+    communication = message || block && block.call
+    formatted_communication = clean(formatter.call([severity], Time.now, progname, communication))
     
     MUTEX.synchronize do
       Syslog.open(progname, @options, @facility) do |s|
@@ -177,7 +177,7 @@ class Syslogger
   def tags_text
     tags = current_tags
     if tags.any?
-      tags.collect { |tag| "[#{tag}] " }.join
+      clean(tags.collect { |tag| "[#{tag}] " }.join) << " "
     end
   end
 

data/spec/syslogger_spec.rb

@@ -182,6 +182,33 @@ describe "Syslogger" do
       syslog.should_receive(:log).with(Syslog::LOG_INFO, "%%me%%ssage%%")
       @logger.add(Logger::INFO, "%me%ssage%")
     end
+    
+    it "should clean formatted message" do
+      Syslog.stub(:open).and_yield(syslog=double("syslog", :mask= => true))
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "m%%e%%s%%s%%a%%g%%e")
+      
+      original_formatter = @logger.formatter
+      begin
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          msg.split(//).join('%')
+        end
+        
+        @logger.add(Logger::INFO, "message")
+      ensure
+        @logger.formatter = original_formatter
+      end
+    end
+    
+    it "should clean tagged message" do
+      Syslog.stub(:open).and_yield(syslog=double("syslog", :mask= => true))
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "[t%%a%%g%%g%%e%%d] [it] message")
+      
+      @logger.tagged("t%a%g%g%e%d") do
+        @logger.tagged("it") do
+          @logger.add(Logger::INFO, "message")
+        end
+      end
+    end
 
     it "should strip the :message" do
       Syslog.stub(:open).and_yield(syslog=double("syslog", :mask= => true))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogger
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake