diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-27 03:00:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-27 03:00:38 +0000 |
commit | e8c00b7027f1bb0a574f982f7e16ecaa6be2757a (patch) | |
tree | 2228770c5e6dda55d1a6062d184cf4c00ebe3380 /lib | |
parent | 6160e4b9f4be0835a59874863de79b066fde1b2c (diff) | |
download | ruby-e8c00b7027f1bb0a574f982f7e16ecaa6be2757a.tar.gz |
logger.rb: fix weekly rotation
* lib/logger.rb (Logger::Period#next_rotate_time): get rid of
adding to mday not to exceed the days of the month.
[ruby-core:71185] [Bug #11620]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/logger.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/logger.rb b/lib/logger.rb index bb4953e437..354d5aff71 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -539,12 +539,14 @@ private t = Time.mktime(now.year, now.month, now.mday) + SiD * (7 - now.wday) when 'monthly' t = Time.mktime(now.year, now.month, 1) + SiD * 31 - mday = (1 if t.mday > 1) + return Time.mktime(t.year, t.month, 1) if t.mday > 1 else return now end - if mday or t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero? - t = Time.mktime(t.year, t.month, mday || (t.mday + (t.hour > 12 ? 1 : 0))) + if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero? + hour = t.hour + t = Time.mktime(t.year, t.month, t.mday) + t += SiD if hour > 12 end t end |