From 226e3c0b12e6e31dff8fb70945c8bc6be48202f0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 16 Jun 2022 16:04:34 +0000 Subject: pure: fix time.rb incompatibility in Ruby 3.1+ The time.rb distributed with Ruby 3.1+ no longer has the RFC2822_MONTH_NAME constant, as Time#strftime in Ruby is locale-independent (unlike strftime(3) in C). This doesn't affect the default C extension, it only affects the pure Ruby code used for Ruby implementations without C extension support. cf. ruby.git commit 5307fab6619e26e05d791d68c35ceef2e923e8d5 --- lib/clogger/pure.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb index 7f82992..4b38e90 100644 --- a/lib/clogger/pure.rb +++ b/lib/clogger/pure.rb @@ -133,17 +133,10 @@ private when :time_iso8601 Time.now.iso8601 when :time_local - t = Time.now - off = t.utc_offset - sign = off < 0 ? '-' : '+' - sprintf("%02d/%s/%d:%02d:%02d:%02d #{sign}%02d%02d", - t.mday, Time::RFC2822_MONTH_NAME[t.mon - 1], - t.year, t.hour, t.min, t.sec, *(off.abs / 60).divmod(60)) + # %b in Ruby is locale-independent, unlike strftime(3) in C + Time.now.strftime('%d/%b/%Y:%H:%M:%S %z') when :time_utc - t = Time.now.utc - sprintf("%02d/%s/%d:%02d:%02d:%02d +0000", - t.mday, Time::RFC2822_MONTH_NAME[t.mon - 1], - t.year, t.hour, t.min, t.sec) + Time.now.utc.strftime('%d/%b/%Y:%H:%M:%S %z') else raise "EDOOFUS #{special_nr}" end -- cgit v1.2.3-24-ge0c7