summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-29 10:45:11 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-29 10:45:11 +0100
commit0b97717b2171820dea41de8df705f8f0e4b71464 (patch)
tree6a5c05313b58c29fd2799c65d26872d782d69921 /app/controllers
parent2cdeb604527414bb865b08a7f4529025ec0802d9 (diff)
parent24f613cac47fae29a48dab351e9ee195f5b53eed (diff)
Merge branch 'develop'
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/trigger_controller.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index ac43832..2b491be 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -97,8 +97,16 @@ class TriggerController < ApplicationController
if fax_document.save
Notifications.new_fax(fax_document).deliver
- File.delete("#{TMP_DIR}#{tiff_file}");
- File.delete(pdf_file);
+ begin
+ File.delete("#{TMP_DIR}#{tiff_file}");
+ rescue => e
+ logger.error "Raw fax file could not be deleted: #{TMP_DIR}#{tiff_file} => #{e.inspect}"
+ end
+ begin
+ File.delete(pdf_file);
+ rescue => e
+ logger.error "PDF fax file could not be deleted: #{TMP_DIR}#{pdf_file} => #{e.inspect}"
+ end
fax_document.tiff = nil
fax_document.save
fax_document.render_thumbnails