lib/sidekiq_unique_jobs/lock/validator.rb in sidekiq-unique-jobs-7.0.0.beta9 vs lib/sidekiq_unique_jobs/lock/validator.rb in sidekiq-unique-jobs-7.0.0.beta10
- old
+ new
@@ -6,10 +6,16 @@
# Validator base class to avoid some duplication
#
# @author Mikael Henriksson <mikael@zoolutions.se>
#
class Validator
+ DEPRECATED_KEYS = {
+ UNIQUE.to_sym => LOCK.to_sym,
+ UNIQUE_ARGS.to_sym => LOCK_ARGS.to_sym,
+ UNIQUE_PREFIX.to_sym => LOCK_PREFIX.to_sym,
+ }.freeze
+
#
# Shorthand for `new(options).validate`
#
# @param [Hash] options the sidekiq_options for the worker being validated
#
@@ -28,11 +34,13 @@
# Initialize a new validator
#
# @param [Hash] options the sidekiq_options for the worker being validated
#
def initialize(options)
+ @options = options.transform_keys(&:to_sym)
@lock_config = LockConfig.new(options)
+ handle_deprecations
end
#
# Validate the workers lock configuration
#
@@ -51,13 +59,27 @@
end
lock_config
end
+ def handle_deprecations
+ DEPRECATED_KEYS.each do |old, new|
+ next unless @options.key?(old)
+
+ lock_config.errors[old] = "is deprecated, use `#{new}: #{@options[old]}` instead."
+ end
+ end
+
+ #
+ # Validates the client configuration
+ #
def validate_client
ClientValidator.validate(lock_config)
end
+ #
+ # Validates the server configuration
+ #
def validate_server
ServerValidator.validate(lock_config)
end
end
end