Rescue any error unmarshalling yaml, fixes sidekiq#2244

yunweiguya · Mar 19, 2015 · c7b9f08 · c7b9f08
1 parent 1a1134c
commit c7b9f08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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'