Skip to content

Commit 0d1c791

Browse files
committed
Refine conversion to path name
Convert the given file name by the dedicated method, and re-use the converted name instead of the given argument.
1 parent c937598 commit 0d1c791

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lib/logger/log_device.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,15 @@ def set_file(shift_age, shift_size, shift_period_suffix)
9797
end
9898

9999
if MODE_TO_OPEN == MODE
100-
def fixup_mode(dev, filename)
100+
def fixup_mode(dev)
101101
dev
102102
end
103103
else
104-
def fixup_mode(dev, filename)
104+
def fixup_mode(dev)
105105
return dev if @binmode
106-
filename = filename.respond_to?(:to_path) ? filename.to_path : filename
107106
dev.autoclose = false
108107
old_dev = dev
109-
dev = File.new(dev.fileno, mode: MODE, path: filename)
108+
dev = File.new(dev.fileno, mode: MODE, path: dev.path)
110109
old_dev.close
111110
PathAttr.set_path(dev, filename) if defined?(PathAttr)
112111
dev
@@ -119,7 +118,7 @@ def open_logfile(filename)
119118
rescue Errno::ENOENT
120119
create_logfile(filename)
121120
else
122-
dev = fixup_mode(dev, filename)
121+
dev = fixup_mode(dev)
123122
dev.sync = true
124123
dev.binmode if @binmode
125124
dev
@@ -130,7 +129,7 @@ def create_logfile(filename)
130129
begin
131130
logdev = File.open(filename, MODE_TO_CREATE)
132131
logdev.flock(File::LOCK_EX)
133-
logdev = fixup_mode(logdev, filename)
132+
logdev = fixup_mode(logdev)
134133
logdev.sync = true
135134
logdev.binmode if @binmode
136135
add_log_header(logdev)

0 commit comments

Comments
 (0)