From 8594cab1403199685a35d9e8b7236f5598510119 Mon Sep 17 00:00:00 2001
From: sonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 20 Nov 2015 14:16:56 +0000
Subject: * lib/logger.rb: expose logger mutex [fix GH-541] Patch by @arthurnn

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/logger.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/logger.rb')

diff --git a/lib/logger.rb b/lib/logger.rb
index d17896f841..77b08fe204 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -626,14 +626,11 @@ private
 
     attr_reader :dev
     attr_reader :filename
-
-    class LogDeviceMutex
-      include MonitorMixin
-    end
+    include MonitorMixin
 
     def initialize(log = nil, opt = {})
       @dev = @filename = @shift_age = @shift_size = nil
-      @mutex = LogDeviceMutex.new
+      mon_initialize
       set_dev(log)
       if @filename
         @shift_age = opt[:shift_age] || 7
@@ -644,7 +641,7 @@ private
 
     def write(message)
       begin
-        @mutex.synchronize do
+        synchronize do
           if @shift_age and @dev.respond_to?(:stat)
             begin
               check_shift_log
@@ -665,7 +662,7 @@ private
 
     def close
       begin
-        @mutex.synchronize do
+        synchronize do
           @dev.close rescue nil
         end
       rescue Exception
@@ -677,7 +674,7 @@ private
       # reopen the same filename if no argument, do nothing for IO
       log ||= @filename if @filename
       if log
-        @mutex.synchronize do
+        synchronize do
           if @filename and @dev
             @dev.close rescue nil # close only file opened by Logger
             @filename = nil
-- 
cgit v1.2.3