diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-27 07:47:14 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-27 07:47:14 +0000 |
commit | ad559b5c1cbaa50273c8063951a4e64a9f2c1fe7 (patch) | |
tree | f3079948dbc4ee6bfa3a99ae8db5d71ea3bbe5c3 | |
parent | 9e4e7771662043a56f2588aff2d3263401bd0997 (diff) |
merge revision(s) 56374: [Backport #12822]
* lib/logger.rb (Logger::Period#next_rotate_time): fix monthly log
rotate when DST is applied during a month of 31 days.
[Fix GH-1458]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/logger.rb | 4 | ||||
-rw-r--r-- | test/logger/test_logdevice.rb | 92 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 101 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Oct 27 16:39:56 2016 Aurelien Jacobs <aurel@gnuage.org> + + * lib/logger.rb (Logger::Period#next_rotate_time): fix monthly log + rotate when DST is applied during a month of 31 days. + [Fix GH-1458] + Thu Oct 27 16:27:06 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> * object.c: Improve documentation for Float conversion. diff --git a/lib/logger.rb b/lib/logger.rb index bd72bd7a78..09c8943c94 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -538,8 +538,8 @@ private when /^weekly$/ 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) + t = Time.mktime(now.year, now.month, 1) + SiD * 32 + mday = 1 else return now end diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb index a563635d14..9faecbd60e 100644 --- a/test/logger/test_logdevice.rb +++ b/test/logger/test_logdevice.rb @@ -365,6 +365,51 @@ class TestLogDevice < Test::Unit::TestCase end end + env_tz_works = /linux|darwin|freebsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb + + def test_shifting_monthly + Dir.mktmpdir do |tmpdir| + assert_in_out_err([{"TZ"=>"UTC"}, *%W"-rlogger -C#{tmpdir} -"], <<-'end;') + begin + module FakeTime + attr_accessor :now + end + + class << Time + prepend FakeTime + end + + log = "log" + File.open(log, "w") {} + + Time.now = Time.utc(2015, 12, 14, 0, 1, 1) + dev = Logger::LogDevice.new("log", shift_age: 'monthly') + + Time.now = Time.utc(2015, 12, 31, 12, 34, 56) + dev.write("#{Time.now} hello-1\n") + File.utime(Time.now, Time.now, log) + + Time.now = Time.utc(2016, 1, 1, 0, 1, 1) + File.utime(Time.now, Time.now, log) + dev.write("#{Time.now} hello-2\n") + ensure + dev.close if dev + end + end; + log = File.join(tmpdir, "log") + cont = File.read(log) + assert_match(/hello-2/, cont) + assert_not_match(/hello-1/, cont) + log = Dir.glob(log+".*") + assert_equal(1, log.size) + log, = *log + cont = File.read(log) + assert_match(/hello-1/, cont) + assert_equal("2015-12-31", cont[/^[-\d]+/]) + assert_equal("20151231", log[/\d+\z/]) + end + end if env_tz_works + def test_shifting_dst_change Dir.mktmpdir do |tmpdir| assert_in_out_err([{"TZ"=>"Europe/London"}, *%W"--disable=gems -rlogger -C#{tmpdir} -"], <<-'end;') @@ -403,6 +448,53 @@ class TestLogDevice < Test::Unit::TestCase end end if /linux|darwin|freebsd/ =~ RUBY_PLATFORM # borrow from test/ruby/test_time_tz.rb + def test_shifting_monthly_dst_change + Dir.mktmpdir do |tmpdir| + assert_separately([{"TZ"=>"Europe/London"}, *%W"-rlogger -C#{tmpdir} -"], <<-'end;') + begin + module FakeTime + attr_accessor :now + end + + class << Time + prepend FakeTime + end + + log = "log" + File.open(log, "w") {} + + Time.now = Time.utc(2016, 9, 1, 0, 1, 1) + dev = Logger::LogDevice.new("log", shift_age: 'monthly') + + Time.now = Time.utc(2016, 9, 8, 7, 6, 5) + dev.write("#{Time.now} hello-1\n") + File.utime(Time.now, Time.now, log) + + Time.now = Time.utc(2016, 10, 9, 8, 7, 6) + File.utime(Time.now, Time.now, log) + dev.write("#{Time.now} hello-2\n") + + Time.now = Time.utc(2016, 10, 9, 8, 7, 7) + File.utime(Time.now, Time.now, log) + dev.write("#{Time.now} hello-3\n") + ensure + dev.close if dev + end + end; + log = File.join(tmpdir, "log") + cont = File.read(log) + assert_match(/hello-2/, cont) + assert_not_match(/hello-1/, cont) + log = Dir.glob(log+".*") + assert_equal(1, log.size) + log, = *log + cont = File.read(log) + assert_match(/hello-1/, cont) + assert_equal("2016-09-08", cont[/^[-\d]+/]) + assert_equal("20160930", log[/\d+\z/]) + end + end if env_tz_works + private def run_children(n, args, src) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-10-27" -#define RUBY_PATCHLEVEL 382 +#define RUBY_PATCHLEVEL 383 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 10 |