diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-02 06:15:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-02 06:15:02 +0000 |
| commit | 3c8072937c66f7536edfc3f18e76d969cdd62a93 (patch) | |
| tree | e2bdd76ea2ed41ce1173dc97442a196bc35bcb78 /lib/logger.rb | |
| parent | 059c94d4f502ba58f95b040bf6a87baefae022e6 (diff) | |
| download | ruby-3c8072937c66f7536edfc3f18e76d969cdd62a93.tar.gz | |
logger.rb: fix r43511 for Windows
* lib/logger.rb (Logger::LogDevice::LogDeviceMutex#lock_shift_log):
open file can't be removed or renamed on Windows. [ruby-dev:47790]
[Bug #9046]
* test/logger/test_logger.rb (TestLogDevice#run_children): don't use
fork.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/logger.rb')
| -rw-r--r-- | lib/logger.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/logger.rb b/lib/logger.rb index 2eb4e642d2..c70b091469 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -633,8 +633,12 @@ private end end - def lock_shift_log - begin + if /mswin|mingw/ =~ RUBY_PLATFORM + def lock_shift_log + yield + end + else + def lock_shift_log retry_limit = 8 retry_sleep = 0.1 begin |