syslogger 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d5b47d8aa6a4b2a3df0bf108b8ed76fea1540a
-  data.tar.gz: 314383df890e4fa2badaeb3a9b39f4f148f626be
+  metadata.gz: 55d44b66d0d0f21132b492ac60cca50af4b3af74
+  data.tar.gz: f352bce8e245b7a0766c8f487f1b90cffd1c7aac
 SHA512:
-  metadata.gz: 5762ef3865af23f47acdeb71f4b8d197780a7a02b87604b53e561871fe9ac8815a794e41024b3f4ef57f8ff6e6c657166165a4b5ec021c855f6f26d574202585
-  data.tar.gz: ff39d2bf1863e1c391cb3c6b7f4625c9aa021838463df85be82d1801192f4ea6e18ab50c6f8912c055faebaf4c9dff036687628bb88709c895caec807ac3d579
+  metadata.gz: 561f991cf10f575fbcc79780af70ef52f586895ce0aa232d1405ddb957cb9b17847d41b8d02b31108700670ca62ed917a74d4b18567f90f5bd7d6033c447f93e
+  data.tar.gz: 37c03b6e2241578271de3027587fe06a96c938a0b540a04882c6de58af3b9220964179cd033c38489b9d340cda977dd16e79396f3536ba7c2ceb7510719349f5

data/lib/syslogger.rb

@@ -4,7 +4,9 @@ require 'thread'
 
 class Syslogger
 
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
+  
+  MUTEX = Mutex.new
 
   attr_reader :level, :ident, :options, :facility, :max_octets
   attr_accessor :formatter
@@ -47,7 +49,6 @@ class Syslogger
     @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS)
     @facility = facility
     @level = Logger::INFO
-    @mutex = Mutex.new
     @formatter = proc do |severity, datetime, progname, msg|
       msg
     end
@@ -90,12 +91,13 @@ class Syslogger
       message, progname = progname, nil
     end
     progname ||= @ident
-
-    @mutex.synchronize do
+    mask = Syslog::LOG_UPTO(MAPPING[@level])
+    communication = clean(message || block && block.call)
+    formatted_communication = formatter.call([severity], Time.now, progname, communication)
+    
+    MUTEX.synchronize do
       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)
+        s.mask = mask
         if self.max_octets
           buffer = "#{tags_text}"
           formatted_communication.bytes do |byte|

data/spec/syslogger_spec.rb

@@ -102,6 +102,40 @@ describe "Syslogger" do
     logger.write "yop"
   end
 
+  it "should allow multiple instances to log at the same time" do
+    logger1 = Syslogger.new("my_app1", Syslog::LOG_PID, Syslog::LOG_USER)
+    logger2 = Syslogger.new("my_app2", Syslog::LOG_PID, Syslog::LOG_USER)
+
+    thread1 = Thread.new do
+      5000.times do |i|
+        logger1.write "logger1"
+      end
+    end
+
+    thread2 = Thread.new do
+      5000.times do |i|
+        logger2.write "logger1"
+      end
+    end
+
+    thread1.join
+    thread2.join
+  end
+  
+  it "should not fail under chaos" do
+    threads = []
+    (1..10).each do
+      threads << Thread.new do
+        (1..100).each do |index|
+          logger = Syslogger.new(Thread.current.inspect, Syslog::LOG_PID, Syslog::LOG_USER)
+          logger.write index
+        end
+      end
+    end
+    
+    threads.each{|thread| thread.join }
+  end
+
   describe "add" do
     before do
       @logger = Syslogger.new("my_app", Syslog::LOG_PID, Syslog::LOG_USER)

metadata

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