diff --git a/lib/sidekiq/client.rb b/lib/sidekiq/client.rb index 98e7e17a..29e87766 100644 --- a/lib/sidekiq/client.rb +++ b/lib/sidekiq/client.rb @@ -38,7 +38,7 @@ module Sidekiq pushed = false Sidekiq.client_middleware.invoke(worker_class, item, queue) do - payload = MultiJson.dump(item) + payload = MultiJson.encode(item) Sidekiq.redis do |conn| _, pushed = conn.multi do conn.sadd('queues', queue) diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb index e056f2f4..8d291351 100644 --- a/lib/sidekiq/manager.rb +++ b/lib/sidekiq/manager.rb @@ -110,7 +110,7 @@ module Sidekiq processor = @ready.pop @in_progress[processor.object_id] = [msg, queue] @busy << processor - processor.process!(MultiJson.load(msg), queue) + processor.process!(MultiJson.decode(msg), queue) end end end diff --git a/lib/sidekiq/middleware/client/unique_jobs.rb b/lib/sidekiq/middleware/client/unique_jobs.rb index 9bfdd304..c067c923 100644 --- a/lib/sidekiq/middleware/client/unique_jobs.rb +++ b/lib/sidekiq/middleware/client/unique_jobs.rb @@ -10,7 +10,7 @@ module Sidekiq def call(worker_class, item, queue) enabled = worker_class.get_sidekiq_options['unique'] if enabled - payload_hash = Digest::MD5.hexdigest(MultiJson.dump(item)) + payload_hash = Digest::MD5.hexdigest(MultiJson.encode(item)) unique = false Sidekiq.redis do |conn| diff --git a/lib/sidekiq/middleware/server/failure_jobs.rb b/lib/sidekiq/middleware/server/failure_jobs.rb index de24c4d7..caa92dcc 100644 --- a/lib/sidekiq/middleware/server/failure_jobs.rb +++ b/lib/sidekiq/middleware/server/failure_jobs.rb @@ -15,7 +15,7 @@ module Sidekiq :queue => args[2] } - Sidekiq.redis {|conn| conn.rpush(:failed, MultiJson.dump(data)) } + Sidekiq.redis {|conn| conn.rpush(:failed, MultiJson.encode(data)) } raise end end diff --git a/lib/sidekiq/middleware/server/retry_jobs.rb b/lib/sidekiq/middleware/server/retry_jobs.rb index 2abd1cbf..7b36f893 100644 --- a/lib/sidekiq/middleware/server/retry_jobs.rb +++ b/lib/sidekiq/middleware/server/retry_jobs.rb @@ -44,7 +44,7 @@ module Sidekiq delay = DELAY.call(count) logger.debug { "Failure! Retry #{count} in #{delay} seconds" } retry_at = Time.now.to_f + delay - payload = MultiJson.dump(msg) + payload = MultiJson.encode(msg) Sidekiq.redis do |conn| conn.zadd('retry', retry_at.to_s, payload) end diff --git a/lib/sidekiq/middleware/server/unique_jobs.rb b/lib/sidekiq/middleware/server/unique_jobs.rb index 7a2c836e..b6887ebd 100644 --- a/lib/sidekiq/middleware/server/unique_jobs.rb +++ b/lib/sidekiq/middleware/server/unique_jobs.rb @@ -5,7 +5,7 @@ module Sidekiq def call(*args) yield ensure - json = MultiJson.dump(args[1]) + json = MultiJson.encode(args[1]) hash = Digest::MD5.hexdigest(json) Sidekiq.redis {|conn| conn.del(hash) } end diff --git a/lib/sidekiq/processor.rb b/lib/sidekiq/processor.rb index 574275c9..a201acd7 100644 --- a/lib/sidekiq/processor.rb +++ b/lib/sidekiq/processor.rb @@ -53,7 +53,7 @@ module Sidekiq redis do |conn| conn.multi do conn.set("worker:#{self}:started", Time.now.to_s) - conn.set("worker:#{self}", MultiJson.dump(:queue => queue, :payload => msg, + conn.set("worker:#{self}", MultiJson.encode(:queue => queue, :payload => msg, :run_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"))) end end diff --git a/lib/sidekiq/retry.rb b/lib/sidekiq/retry.rb index 0f6e81e4..3e1688ee 100644 --- a/lib/sidekiq/retry.rb +++ b/lib/sidekiq/retry.rb @@ -46,7 +46,7 @@ module Sidekiq messages.each do |message| logger.debug { "Retrying #{message}" } - msg = MultiJson.load(message) + msg = MultiJson.decode(message) conn.rpush("queue:#{msg['queue']}", message) end end diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index f1816d8d..bd2f03fa 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -52,7 +52,7 @@ module Sidekiq Sidekiq.redis do |conn| conn.smembers('workers').map do |w| msg = conn.get("worker:#{w}") - msg = MultiJson.load(msg) if msg + msg = MultiJson.decode(msg) if msg [w, msg] end.sort { |x| x[1] ? -1 : 1 } end @@ -74,7 +74,7 @@ module Sidekiq def retries Sidekiq.redis do |conn| results = conn.zrange('retry', 0, 25, :withscores => true) - results.each_slice(2).map { |msg, score| [MultiJson.load(msg), Float(score)] } + results.each_slice(2).map { |msg, score| [MultiJson.decode(msg), Float(score)] } end end @@ -89,7 +89,7 @@ module Sidekiq def retries_with_score(score) Sidekiq.redis do |conn| results = conn.zrangebyscore('retry', score, score) - results.map { |msg| MultiJson.load(msg) } + results.map { |msg| MultiJson.decode(msg) } end end @@ -124,7 +124,7 @@ module Sidekiq get "/queues/:name" do halt 404 unless params[:name] @name = params[:name] - @messages = Sidekiq.redis {|conn| conn.lrange("queue:#{@name}", 0, 10) }.map { |str| MultiJson.load(str) } + @messages = Sidekiq.redis {|conn| conn.lrange("queue:#{@name}", 0, 10) }.map { |str| MultiJson.decode(str) } slim :queue end @@ -142,7 +142,7 @@ module Sidekiq results = conn.zrangebyscore('retry', score, score) conn.zremrangebyscore('retry', score, score) results.map do |message| - msg = MultiJson.load(message) + msg = MultiJson.decode(message) conn.rpush("queue:#{msg['queue']}", message) end end diff --git a/sidekiq.gemspec b/sidekiq.gemspec index d27ecd52..4a25be24 100644 --- a/sidekiq.gemspec +++ b/sidekiq.gemspec @@ -13,15 +13,15 @@ Gem::Specification.new do |gem| gem.name = "sidekiq" gem.require_paths = ["lib"] gem.version = Sidekiq::VERSION - gem.add_dependency 'redis' - gem.add_dependency 'redis-namespace' - gem.add_dependency 'connection_pool', '~> 0.9.0' - gem.add_dependency 'celluloid', '~> 0.10.0' - gem.add_dependency 'multi_json', '~> 1.3' - gem.add_development_dependency 'minitest' - gem.add_development_dependency 'sinatra' - gem.add_development_dependency 'slim' - gem.add_development_dependency 'rake' - gem.add_development_dependency 'actionmailer', '~> 3' - gem.add_development_dependency 'activerecord', '~> 3' + gem.add_dependency 'redis' + gem.add_dependency 'redis-namespace' + gem.add_dependency 'connection_pool', '~> 0.9.0' + gem.add_dependency 'celluloid', '~> 0.10.0' + gem.add_dependency 'multi_json', '~> 1' + gem.add_development_dependency 'minitest' + gem.add_development_dependency 'sinatra' + gem.add_development_dependency 'slim' + gem.add_development_dependency 'rake' + gem.add_development_dependency 'actionmailer', '~> 3' + gem.add_development_dependency 'activerecord', '~> 3' end diff --git a/test/test_retry.rb b/test/test_retry.rb index 813ddbfa..6cf34563 100644 --- a/test/test_retry.rb +++ b/test/test_retry.rb @@ -81,7 +81,7 @@ class TestRetry < MiniTest::Unit::TestCase end it 'should poll like a bad mother...SHUT YO MOUTH' do - fake_msg = MultiJson.dump({ 'class' => 'Bob', 'args' => [1,2], 'queue' => 'someq' }) + fake_msg = MultiJson.encode({ 'class' => 'Bob', 'args' => [1,2], 'queue' => 'someq' }) @redis.expect :multi, [[fake_msg], 1], [] @redis.expect :rpush, 1, ['queue:someq', fake_msg]