summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJesse Chavez <[email protected]>2022-01-26 14:05:21 -0500
committergit <[email protected]>2022-01-27 12:33:06 +0900
commit99d02caed3fb86a8bbe3ae6daddf2517e2f3f441 (patch)
tree985717e6eac13f8235ae63a028164b93bc91a4c6 /lib
parentd3d888b9867e4fe6baa28d4f5351f72961a3bb1f (diff)
[ruby/logger] Fix log rotation inter-process lock failed.
Issue only occurs in JRuby 9.3.0.0 and Windows and the full console output is: log rotation inter-process lock failed. D:\log.txt -> D:\log.txt.0: The process cannot access the file because it is being used by another process. log writing failed. closed stream log writing failed. closed stream ... https://github.com/ruby/logger/commit/19fc734638
Diffstat (limited to 'lib')
-rw-r--r--lib/logger.rb1
-rw-r--r--lib/logger/log_device.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/logger.rb b/lib/logger.rb
index 4205380a6a..7d55f62f30 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -11,6 +11,7 @@
# A simple system for logging messages. See Logger for more documentation.
require 'monitor'
+require 'rbconfig'
require_relative 'logger/version'
require_relative 'logger/formatter'
diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
index 96d77b7b6a..8683328a5e 100644
--- a/lib/logger/log_device.rb
+++ b/lib/logger/log_device.rb
@@ -135,7 +135,7 @@ class Logger
end
end
- if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+ if /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os']
def lock_shift_log
yield
end