Refactor rescue behavior.

2 files changed, 38 insertions, 29 deletions

diff --git a/lib/chef/formatters/error_inspectors/api_error_formatting.rb b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
index dca2835f23..652d478b40 100644
--- a/lib/chef/formatters/error_inspectors/api_error_formatting.rb
+++ b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
@@ -88,20 +88,7 @@ E
       def format_rest_error
         Array(Chef::JSONCompat.from_json(exception.response.body)["error"]).join('; ')
       rescue Exception
-        # When we get 504 from the server, sometimes the response body is non-readable.
-        #
-        # Stack trace:
-        #
-        # NoMethodError: undefined method `closed?' for nil:NilClass
-        # .../lib/ruby/1.9.1/net/http.rb:2789:in `stream_check'
-        # .../lib/ruby/1.9.1/net/http.rb:2709:in `read_body'
-        # .../lib/ruby/1.9.1/net/http.rb:2736:in `body'
-        # .../lib/chef/formatters/error_inspectors/api_error_formatting.rb:91:in `rescue in format_rest_error'
-        begin
-          exception.response.body
-        rescue Exception
-          "Cannot fetch the contents of the response."
-        end
+        safe_format_rest_error
       end
 
       def username
@@ -120,6 +107,23 @@ E
         exception.response.body =~ /synchronize the clock/i
       end
 
+      def safe_format_rest_error
+        # When we get 504 from the server, sometimes the response body is non-readable.
+        #
+        # Stack trace:
+        #
+        # NoMethodError: undefined method `closed?' for nil:NilClass
+        # .../lib/ruby/1.9.1/net/http.rb:2789:in `stream_check'
+        # .../lib/ruby/1.9.1/net/http.rb:2709:in `read_body'
+        # .../lib/ruby/1.9.1/net/http.rb:2736:in `body'
+        # .../lib/chef/formatters/error_inspectors/api_error_formatting.rb:91:in `rescue in format_rest_error'
+        begin
+          exception.response.body
+        rescue Exception
+          "Cannot fetch the contents of the response."
+        end
+      end
+
     end
   end
 end
diff --git a/lib/chef/mixin/create_path.rb b/lib/chef/mixin/create_path.rb
index ef8f381635..ff20a65cb1 100644
--- a/lib/chef/mixin/create_path.rb
+++ b/lib/chef/mixin/create_path.rb
@@ -44,25 +44,30 @@ class Chef
 
         file_path.each_index do |i|
           create_path = File.join(file_path[0, i + 1])
-          unless File.directory?(create_path)
-            begin
-              # In multithreaded environments, the following interleaving raises
-              # an error here:
-              #
-              # thread1                                     thread2
-              # File.directory?(create_path) <- false
-              #                                             File.directory?(create_path) <- false
-              #                                             Dir.mkdir(create_path)
-              # Dir.mkdir(create_path) <- raises Errno::EEXIST
-              Chef::Log.debug("Creating directory #{create_path}")
-              Dir.mkdir(create_path)
-            rescue Errno::EEXIST
-            end
-          end
+          create_dir(create_path) unless File.directory?(create_path)
         end
+
         File.expand_path(File.join(file_path))
       end
 
+      private
+
+      def create_dir(path)
+        begin
+          # In multithreaded environments, the following interleaving raises
+          # an error here:
+          #
+          # thread1                                     thread2
+          # File.directory?(create_path) <- false
+          #                                             File.directory?(create_path) <- false
+          #                                             Dir.mkdir(create_path)
+          # Dir.mkdir(create_path) <- raises Errno::EEXIST
+          Chef::Log.debug("Creating directory #{path}")
+          Dir.mkdir(path)
+        rescue Errno::EEXIST
+        end
+      end
+
     end
   end
 end