aboutsummaryrefslogtreecommitdiffstats
path: root/lib/logger.rb
diff options
context:
space:
mode:
authorsonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-20 14:16:56 +0000
committersonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-20 14:16:56 +0000
commit8594cab1403199685a35d9e8b7236f5598510119 (patch)
treec0c5bb0e2ee2a38e0e059543409cddcb7a8e2bb9 /lib/logger.rb
parenta90c99ee0ca82d7d3555f6f4bdb8bdd361a5b7e0 (diff)
downloadruby-8594cab1403199685a35d9e8b7236f5598510119.tar.gz
* 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
Diffstat (limited to 'lib/logger.rb')
-rw-r--r--lib/logger.rb13
1 files changed, 5 insertions, 8 deletions
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