[ruby/logger] Raise ArgumentError for invalid shift_age

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

Fixes Ruby Bug 15977

https://github.com/ruby/logger/commit/f92979a376

1 files changed, 6 insertions, 2 deletions

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