Merge branch 'master' into feature/generalized-start-script

Changes.md

@@ -1,3 +1,10 @@
+2.17.2
+-----------
+
+- Fix race condition in bulk requeue during shutdown [#1406]
+- Fix bug where strictly prioritized queues might be processed out of
+  order [#1408]
+
 2.17.1
 -----------
 

lib/sidekiq/middleware/i18n.rb

@@ -14,7 +14,7 @@ def call(worker, msg, queue)
       I18n.locale = msg['locale'] || I18n.default_locale
       yield
     ensure
-      I18n.locale = nil
+      I18n.locale = I18n.default_locale
     end
   end
 end

lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.1"
+  VERSION = "2.17.2"
 end

test/test_middleware.rb

@@ -123,13 +123,27 @@ def call(*args)
       assert_equal :fr, msg['locale']
 
       msg['locale'] = 'jp'
-      I18n.locale = nil
+      I18n.locale = I18n.default_locale
       assert_equal :en, I18n.locale
       mw = Sidekiq::Middleware::I18n::Server.new
       mw.call(nil, msg, nil) do
         assert_equal :jp, I18n.locale
       end
       assert_equal :en, I18n.locale
     end
+
+    it 'supports I18n.enforce_available_locales = true' do
+      I18n.enforce_available_locales = true
+      I18n.available_locales = [:en, :jp]
+
+      msg = { 'locale' => 'jp' }
+      mw = Sidekiq::Middleware::I18n::Server.new
+      mw.call(nil, msg, nil) do
+        assert_equal :jp, I18n.locale
+      end
+
+      I18n.enforce_available_locales = nil
+      I18n.available_locales = nil
+    end
   end
 end