From a5c7bb6f3ac6b423c48bbfc71aa8df709b80253c Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 21 Aug 2020 11:35:54 -0700 Subject: Update how we determine if time was loaded Signed-off-by: Tim Smith --- lib/mixlib/log/formatter.rb | 2 +- spec/mixlib/log/formatter_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mixlib/log/formatter.rb b/lib/mixlib/log/formatter.rb index 1febe90..9041ff6 100644 --- a/lib/mixlib/log/formatter.rb +++ b/lib/mixlib/log/formatter.rb @@ -16,7 +16,7 @@ # limitations under the License. require "logger" -require "time" unless defined?(Time) +require "time" unless defined?(Time.zone_offset) module Mixlib module Log diff --git a/spec/mixlib/log/formatter_spec.rb b/spec/mixlib/log/formatter_spec.rb index 491bb10..ee7de09 100644 --- a/spec/mixlib/log/formatter_spec.rb +++ b/spec/mixlib/log/formatter_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "time" unless defined?(Time) +require "time" unless defined?(Time.zone_offset) require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) RSpec.describe Mixlib::Log::Formatter do -- cgit v1.2.1