Skip to content

Commit fe2139e

Browse files
committed
Don't recurse settings by default
1 parent 0459dfd commit fe2139e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/models/miq_worker.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ def self.fetch_worker_settings_from_options_hash(options_hash, raw = false)
224224

225225
# If not specified, provide the worker_settings cleaned up in fixnums, etc. instead of 1.seconds, 10.megabytes
226226
# and decrypt any values which are encrypted with ManageIQ::Password.
227-
def self.normalize_settings!(settings)
227+
def self.normalize_settings!(settings, recurse: false)
228228
settings.each_key do |k|
229-
if settings[k].kind_of?(Hash)
229+
if settings[k].kind_of?(Hash) && recurse
230230
normalize_settings!(settings[k])
231231
elsif settings[k].kind_of?(String)
232232
if settings[k].number_with_method?

app/models/miq_worker/runner.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ def worker_options
495495

496496
{
497497
:messaging => MiqQueue.messaging_client_options,
498-
:settings => worker.class.normalize_settings!(settings)
498+
:settings => worker.class.normalize_settings!(settings, :recurse => true)
499499
}
500500
end
501501

0 commit comments

Comments
 (0)