kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/logger] Raise ArgumentError for invalid shift_age

Browse source 
Consider 'now' and 'everytime' as valid values for the previous
behavior of rotating everytime.

Fixes Ruby Bug 15977

f92979a376
This commit is contained in:
Jeremy Evans 2019-10-14 18:08:10 -07:00 • committed by Hiroshi SHIBATA
parent eb18cb3e47
commit 38722fa179
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/logger/period.rb
View file

@ -15,8 +15,10 @@ class Logger
when 'monthly' when 'monthly'
t = Time.mktime(now.year, now.month, 1) + SiD * 32 t = Time.mktime(now.year, now.month, 1) + SiD * 32
return Time.mktime(t.year, t.month, 1) return Time.mktime(t.year, t.month, 1)
else when 'now', 'everytime'
return now return now
else
raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
end end
if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero? if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero?
hour = t.hour hour = t.hour
@ -34,8 +36,10 @@ class Logger
t = Time.mktime(now.year, now.month, now.mday) - (SiD * now.wday + SiD / 2) t = Time.mktime(now.year, now.month, now.mday) - (SiD * now.wday + SiD / 2)
when 'monthly' when 'monthly'
t = Time.mktime(now.year, now.month, 1) - SiD / 2 t = Time.mktime(now.year, now.month, 1) - SiD / 2
else when 'now', 'everytime'
return now return now
else
raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
end end
Time.mktime(t.year, t.month, t.mday, 23, 59, 59) Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
end end

7
test/logger/test_logdevice.rb
View file

@ -275,8 +275,12 @@ class TestLogDevice < Test::Unit::TestCase
logger.close logger.close
end end
def test_invalid_shifting_age
assert_raise(ArgumentError) { Logger.new(@filename, 'invalid') }
assert_raise(ArgumentError) { Logger::Period.previous_period_end(Time.now, 'invalid') }
end
def test_shifting_age def test_shifting_age
# shift_age other than 'daily', 'weekly', and 'monthly' means 'everytime'
yyyymmdd = Time.now.strftime("%Y%m%d") yyyymmdd = Time.now.strftime("%Y%m%d")
filename1 = @filename + ".#{yyyymmdd}" filename1 = @filename + ".#{yyyymmdd}"
filename2 = @filename + ".#{yyyymmdd}.1" filename2 = @filename + ".#{yyyymmdd}.1"
@ -311,7 +315,6 @@ class TestLogDevice < Test::Unit::TestCase
end end
def test_shifting_period_suffix def test_shifting_period_suffix
# shift_age other than 'daily', 'weekly', and 'monthly' means 'everytime'
['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format| ['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format|
if format == '%Y%m%d' # default if format == '%Y%m%d' # default
logger = Logger.new(@filename, 'now', 1048576) logger = Logger.new(@filename, 'now', 1048576)