diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2d540c9..69a62b1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --exclude-limit 180` -# on 2023-04-20 23:33:11 UTC using RuboCop version 1.50.2. +# on 2023-05-31 23:33:50 UTC using RuboCop version 1.51.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -377,18 +377,6 @@ Rails/SkipsModelValidations: - 'spec/lib/dispatch-rider/queue_services/file_system_spec.rb' - 'spec/lib/dispatch-rider/queue_services/simple_spec.rb' -# Offense count: 10 -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: strict, flexible -Rails/TimeZone: - Exclude: - - 'lib/dispatch-rider/logging/lifecycle_logger.rb' - - 'lib/dispatch-rider/queue_services/aws_sqs.rb' - - 'lib/dispatch-rider/queue_services/aws_sqs/sqs_received_message.rb' - - 'lib/dispatch-rider/scheduled_job.rb' - - 'spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb' - # Offense count: 3 # This cop supports unsafe autocorrection (--autocorrect-all). Security/JSONLoad: diff --git a/lib/dispatch-rider/logging/lifecycle_logger.rb b/lib/dispatch-rider/logging/lifecycle_logger.rb index 5b477a5..ee92072 100644 --- a/lib/dispatch-rider/logging/lifecycle_logger.rb +++ b/lib/dispatch-rider/logging/lifecycle_logger.rb @@ -13,7 +13,7 @@ def log_got_stop(reason, message) end def wrap_handling(message) - start_time = Time.now + start_time = Time.zone.now log_start(message) yield log_success(message) @@ -21,7 +21,7 @@ def wrap_handling(message) log_fail(message, exception) raise exception ensure - log_complete(message, Time.now - start_time) + log_complete(message, Time.zone.now - start_time) end private diff --git a/lib/dispatch-rider/queue_services/aws_sqs.rb b/lib/dispatch-rider/queue_services/aws_sqs.rb index c8e9c77..97aef7e 100644 --- a/lib/dispatch-rider/queue_services/aws_sqs.rb +++ b/lib/dispatch-rider/queue_services/aws_sqs.rb @@ -72,7 +72,7 @@ def set_visibility_timeout(client, url) def visibility_timeout_shield(message) yield ensure - duration = Time.now - message.start_time + duration = Time.zone.now - message.start_time timeout = message.total_timeout if duration > timeout message = "message: #{message.subject}, #{message.body.inspect} took #{duration} seconds while the timeout was #{timeout}" diff --git a/lib/dispatch-rider/queue_services/aws_sqs/sqs_received_message.rb b/lib/dispatch-rider/queue_services/aws_sqs/sqs_received_message.rb index 5315f2d..f6fe6d5 100644 --- a/lib/dispatch-rider/queue_services/aws_sqs/sqs_received_message.rb +++ b/lib/dispatch-rider/queue_services/aws_sqs/sqs_received_message.rb @@ -9,7 +9,7 @@ class SqsReceivedMessage < ReceivedMessage def initialize(message, raw_item, queue, queue_visibility_timeout) @queue = queue @total_timeout = queue_visibility_timeout.to_i - @start_time = Time.now + @start_time = Time.zone.now super(message, raw_item) end @@ -19,7 +19,7 @@ def extend_timeout(timeout) item.change_visibility({ visibility_timeout: timeout # required }) - @total_timeout = timeout + (Time.now - start_time).to_i if timeout > 0 + @total_timeout = timeout + (Time.zone.now - start_time).to_i if timeout > 0 end # We effectively return the item to the queue by setting diff --git a/lib/dispatch-rider/scheduled_job.rb b/lib/dispatch-rider/scheduled_job.rb index 622317a..41092aa 100644 --- a/lib/dispatch-rider/scheduled_job.rb +++ b/lib/dispatch-rider/scheduled_job.rb @@ -42,9 +42,9 @@ def get_new_claim_stub :message, presence: true - scope :due, -> (time = Time.now) { where "scheduled_at <= ?", time } - scope :claimed_by, -> (claim_id) { where(claim_id: claim_id).where "claim_expires_at > ?", Time.now } - scope :unclaimed, -> { where "claim_expires_at IS NULL OR claim_expires_at <= ?", Time.now } + scope :due, -> (time = Time.zone.now) { where "scheduled_at <= ?", time } + scope :claimed_by, -> (claim_id) { where(claim_id: claim_id).where "claim_expires_at > ?", Time.zone.now } + scope :unclaimed, -> { where "claim_expires_at IS NULL OR claim_expires_at <= ?", Time.zone.now } def publish publisher.publish(destinations: destinations, message: message) diff --git a/spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb b/spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb index 297000e..fac752b 100644 --- a/spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb +++ b/spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb @@ -62,7 +62,7 @@ "SenderId" => "123456789012", "SentTimestamp" => Time.now.to_i.to_s, "ApproximateReceivedCount" => "12", - "ApproximateFirstReceiveTimestamp" => (Time.now + 12).to_i.to_s, + "ApproximateFirstReceiveTimestamp" => (Time.zone.now + 12).to_i.to_s, } end @@ -124,7 +124,7 @@ "SenderId" => "123456789012", "SentTimestamp" => Time.now.to_i.to_s, "ApproximateReceivedCount" => "12", - "ApproximateFirstReceiveTimestamp" => (Time.now + 12).to_i.to_s, + "ApproximateFirstReceiveTimestamp" => (Time.zone.now + 12).to_i.to_s, } end