Prefer block version of File.open to ensure file gets automatically c…

…losed
chessbyte · Oct 21, 2019 · 2082460 · 2082460
1 parent 5819fce
commit 2082460
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/task_helpers/imports/reports.rb b/lib/task_helpers/imports/reports.rb
@@ -12,8 +12,7 @@ def import(options = {})
                              :overwrite => options[:overwrite],
                              :save      => true }
 
-          begin
-            report_fd = File.open(filename, 'r')
+          File.open(filename, 'r') do |report_fd|
             MiqReport.import(report_fd, report_options)
           rescue ActiveModel::UnknownAttributeError, RuntimeError => err
             $log.error("Error importing #{filename} : #{err.message}")

diff --git a/lib/task_helpers/imports/widgets.rb b/lib/task_helpers/imports/widgets.rb
@@ -12,8 +12,7 @@ def import(options = {})
                              :overwrite => options[:overwrite],
                              :save      => true }
 
-          begin
-            widget_fd = File.open(filename, 'r')
+          File.open(filename, 'r') do |widget_fd|
             MiqWidget.import(widget_fd, widget_options)
           rescue ActiveModel::UnknownAttributeError, RuntimeError => err
             $log.error("Error importing #{filename} : #{err.message}")