Skip to content

Refine conversion to path name #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 1 commit into from
Feb 14, 2025
Merged

Refine conversion to path name #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions lib/logger/log_device.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,15 @@ def set_file(shift_age, shift_size, shift_period_suffix)
end

if MODE_TO_OPEN == MODE
def fixup_mode(dev, filename)
def fixup_mode(dev)
dev
end
else
def fixup_mode(dev, filename)
def fixup_mode(dev)
return dev if @binmode
filename = filename.respond_to?(:to_path) ? filename.to_path : filename
dev.autoclose = false
old_dev = dev
dev = File.new(dev.fileno, mode: MODE, path: filename)
dev = File.new(dev.fileno, mode: MODE, path: dev.path)
old_dev.close
PathAttr.set_path(dev, filename) if defined?(PathAttr)
dev
Expand All @@ -119,7 +118,7 @@ def open_logfile(filename)
rescue Errno::ENOENT
create_logfile(filename)
else
dev = fixup_mode(dev, filename)
dev = fixup_mode(dev)
dev.sync = true
dev.binmode if @binmode
dev
Expand All @@ -130,7 +129,7 @@ def create_logfile(filename)
begin
logdev = File.open(filename, MODE_TO_CREATE)
logdev.flock(File::LOCK_EX)
logdev = fixup_mode(logdev, filename)
logdev = fixup_mode(logdev)
logdev.sync = true
logdev.binmode if @binmode
add_log_header(logdev)
Expand Down