mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Rescue any error unmarshalling yaml, fixes #2244
This commit is contained in:
parent
1a1134c2d8
commit
c7b9f082f4
2 changed files with 4 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -341,7 +341,7 @@ module Sidekiq
|
|||
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'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue