From f36147ff329fd1db4a9b9c89e08c5076fd41b659 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Mon, 1 Jul 2013 12:43:43 +0200 Subject: exception handling --- app/controllers/trigger_controller.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb index 3dbb2a5..290a1fc 100644 --- a/app/controllers/trigger_controller.rb +++ b/app/controllers/trigger_controller.rb @@ -135,8 +135,18 @@ class TriggerController < ApplicationController working_path, tiff_file = File.split(fax_document.tiff) if fax_document.store_dir != working_path - FileUtils.mkdir(fax_document.store_dir) - FileUtils.mv(fax_document.tiff, fax_document.store_dir) + begin + FileUtils.mkdir(fax_document.store_dir) + rescue => e + logger.error "PDF fax directory not created: #{fax_document.store_dir} => #{e.inspect}" + end + + begin + FileUtils.mv(fax_document.tiff, fax_document.store_dir) + rescue => e + logger.error "PDF fax files not moved: #{fax_document.tiff} => #{e.inspect}" + end + fax_document.tiff = "#{fax_document.store_dir}/#{tiff_file}" end -- cgit v1.2.3 From 7a42f972e8790b04754be6e636e1028fc3d5d70f Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Mon, 1 Jul 2013 12:54:16 +0200 Subject: Revert "exception handling" This reverts commit f36147ff329fd1db4a9b9c89e08c5076fd41b659. --- app/controllers/trigger_controller.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb index 290a1fc..3dbb2a5 100644 --- a/app/controllers/trigger_controller.rb +++ b/app/controllers/trigger_controller.rb @@ -135,18 +135,8 @@ class TriggerController < ApplicationController working_path, tiff_file = File.split(fax_document.tiff) if fax_document.store_dir != working_path - begin - FileUtils.mkdir(fax_document.store_dir) - rescue => e - logger.error "PDF fax directory not created: #{fax_document.store_dir} => #{e.inspect}" - end - - begin - FileUtils.mv(fax_document.tiff, fax_document.store_dir) - rescue => e - logger.error "PDF fax files not moved: #{fax_document.tiff} => #{e.inspect}" - end - + FileUtils.mkdir(fax_document.store_dir) + FileUtils.mv(fax_document.tiff, fax_document.store_dir) fax_document.tiff = "#{fax_document.store_dir}/#{tiff_file}" end -- cgit v1.2.3 From 790253f927872e79e562b44575be529f573ad0ef Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Mon, 1 Jul 2013 12:55:15 +0200 Subject: exception handling --- app/controllers/trigger_controller.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb index 3dbb2a5..290a1fc 100644 --- a/app/controllers/trigger_controller.rb +++ b/app/controllers/trigger_controller.rb @@ -135,8 +135,18 @@ class TriggerController < ApplicationController working_path, tiff_file = File.split(fax_document.tiff) if fax_document.store_dir != working_path - FileUtils.mkdir(fax_document.store_dir) - FileUtils.mv(fax_document.tiff, fax_document.store_dir) + begin + FileUtils.mkdir(fax_document.store_dir) + rescue => e + logger.error "PDF fax directory not created: #{fax_document.store_dir} => #{e.inspect}" + end + + begin + FileUtils.mv(fax_document.tiff, fax_document.store_dir) + rescue => e + logger.error "PDF fax files not moved: #{fax_document.tiff} => #{e.inspect}" + end + fax_document.tiff = "#{fax_document.store_dir}/#{tiff_file}" end -- cgit v1.2.3