mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Remove support for old, uncompressed backtrace fmt
This commit is contained in:
parent
6fb839afac
commit
813b8cfa15
2 changed files with 3 additions and 35 deletions
|
@ -433,20 +433,9 @@ module Sidekiq
|
|||
end
|
||||
|
||||
def uncompress_backtrace(backtrace)
|
||||
if backtrace.is_a?(Array)
|
||||
# Handle old jobs with raw Array backtrace format
|
||||
backtrace
|
||||
else
|
||||
decoded = Base64.decode64(backtrace)
|
||||
uncompressed = Zlib::Inflate.inflate(decoded)
|
||||
begin
|
||||
Sidekiq.load_json(uncompressed)
|
||||
rescue
|
||||
# Handle old jobs with marshalled backtrace format
|
||||
# TODO Remove in 7.x
|
||||
Marshal.load(uncompressed)
|
||||
end
|
||||
end
|
||||
decoded = Base64.decode64(backtrace)
|
||||
uncompressed = Zlib::Inflate.inflate(decoded)
|
||||
Sidekiq.load_json(uncompressed)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -274,27 +274,6 @@ describe "API" do
|
|||
assert_nil job.enqueued_at
|
||||
end
|
||||
|
||||
it 'handles previous (raw Array) error_backtrace format' do
|
||||
add_retry
|
||||
job = Sidekiq::RetrySet.new.first
|
||||
assert_equal ["line1", "line2"], job.error_backtrace
|
||||
end
|
||||
|
||||
it "handles previous (marshalled Array) error_backtrace format" do
|
||||
backtrace = ["line1", "line2"]
|
||||
serialized = Marshal.dump(backtrace)
|
||||
compressed = Zlib::Deflate.deflate(serialized)
|
||||
encoded = Base64.encode64(compressed)
|
||||
|
||||
payload = Sidekiq.dump_json("class" => "ApiWorker", "args" => [1], "queue" => "default", "jid" => "jid", "error_backtrace" => encoded)
|
||||
Sidekiq.redis do |conn|
|
||||
conn.zadd("retry", Time.now.to_f.to_s, payload)
|
||||
end
|
||||
|
||||
job = Sidekiq::RetrySet.new.first
|
||||
assert_equal backtrace, job.error_backtrace
|
||||
end
|
||||
|
||||
describe "Rails unwrapping" do
|
||||
SERIALIZED_JOBS = {
|
||||
"5.x" => [
|
||||
|
|
Loading…
Add table
Reference in a new issue