From 94fd03f5d02953c9a61067199b8a32611a44603c Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 28 Oct 2014 11:20:49 -0700 Subject: [PATCH] since ugoira converter always uses the md5 file path as the base, no longer have to delay unlinking the tempfile --- app/models/upload.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/models/upload.rb b/app/models/upload.rb index 5cb4f0393..ca04eb075 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -139,13 +139,7 @@ class Upload < ActiveRecord::Base update_attributes(:status => "error: #{x.class} - #{x.message}", :backtrace => x.backtrace.join("\n")) ensure - if async_conversion? - # need to delay this because we have to process the file - # before deleting it - delay(:queue => Socket.gethostname).delete_temp_file(temp_file_path) - else - delete_temp_file - end + delete_temp_file end def async_conversion?