Remove tempfile patch for trace data
Effectively reverts c0d2ad40c3
This patch is no longer required, since we only use send_data in
combination with Tempfile.read and that all works fine.
This commit is contained in:
parent
c51786d10b
commit
32e46ad4e3
2 changed files with 8 additions and 17 deletions
|
@ -215,25 +215,23 @@ class Trace < ApplicationRecord
|
||||||
tarred = filetype =~ /tar archive/
|
tarred = filetype =~ /tar archive/
|
||||||
|
|
||||||
if gzipped || bzipped || zipped || tarred
|
if gzipped || bzipped || zipped || tarred
|
||||||
tmpfile = Tempfile.new("trace.#{id}")
|
file = Tempfile.new("trace.#{id}")
|
||||||
|
|
||||||
if tarred && gzipped
|
if tarred && gzipped
|
||||||
system("tar -zxOf #{trace_name} > #{tmpfile.path}")
|
system("tar -zxOf #{trace_name} > #{file.path}")
|
||||||
elsif tarred && bzipped
|
elsif tarred && bzipped
|
||||||
system("tar -jxOf #{trace_name} > #{tmpfile.path}")
|
system("tar -jxOf #{trace_name} > #{file.path}")
|
||||||
elsif tarred
|
elsif tarred
|
||||||
system("tar -xOf #{trace_name} > #{tmpfile.path}")
|
system("tar -xOf #{trace_name} > #{file.path}")
|
||||||
elsif gzipped
|
elsif gzipped
|
||||||
system("gunzip -c #{trace_name} > #{tmpfile.path}")
|
system("gunzip -c #{trace_name} > #{file.path}")
|
||||||
elsif bzipped
|
elsif bzipped
|
||||||
system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
|
system("bunzip2 -c #{trace_name} > #{file.path}")
|
||||||
elsif zipped
|
elsif zipped
|
||||||
system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path} 2> /dev/null")
|
system("unzip -p #{trace_name} -x '__MACOSX/*' > #{file.path} 2> /dev/null")
|
||||||
end
|
end
|
||||||
|
|
||||||
tmpfile.unlink
|
file.unlink
|
||||||
|
|
||||||
file = tmpfile.file
|
|
||||||
else
|
else
|
||||||
file = File.open(trace_name)
|
file = File.open(trace_name)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
# Hack TempFile to let us get at the underlying File object as ruby
|
|
||||||
# does a half assed job of making TempFile act as a File
|
|
||||||
class Tempfile
|
|
||||||
def file
|
|
||||||
@tmpfile
|
|
||||||
end
|
|
||||||
end
|
|
Loading…
Add table
Reference in a new issue