diff --git a/Changes.md b/Changes.md index 8199fa7a4..dae706fee 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,8 @@ -HEAD +3.3.3 ----------- +- Fix crash on exit when Redis is down [#2235] +- Fix duplicate logging on startup - Undeprecate delay extension for ActionMailer 4.2+ . [#2186] 3.3.2 diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb index 430a25bd4..9189bc38c 100644 --- a/lib/sidekiq/api.rb +++ b/lib/sidekiq/api.rb @@ -341,7 +341,7 @@ def [](name) def safe_load(content, default) begin yield(*YAML.load(content)) - rescue ::ArgumentError => ex + rescue => ex # #1761 in dev mode, it's possible to have jobs enqueued which haven't been loaded into # memory yet so the YAML can't be loaded. Sidekiq.logger.warn "Unable to load YAML: #{ex.message}" unless Sidekiq.options[:environment] == 'development'