consolidate error slurp/reraising a bit

fog · Jun 12, 2010 · 61e7ec0 · 61e7ec0
1 parent 6171201
commit 61e7ec0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb
@@ -227,15 +227,12 @@ def request(params)
             })
           rescue Excon::Errors::Error => error
             if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
-              new_error = case match[1].split('.').last
+              raise case match[1].split('.').last
               when 'NotFound'
-                Fog::AWS::EC2::NotFound.new(match[2])
+                Fog::AWS::EC2::NotFound.slurp(error, match[2])
               else
-                Fog::AWS::EC2::Error.new("#{match[1]} => #{match[2]}")
+                Fog::AWS::EC2::Error.slurp(error, "#{match[1]} => #{match[2]}")
               end
-              new_error.set_backtrace(error.backtrace)
-              new_error.verbose = error.message
-              raise new_error
             else
               raise error
             end

diff --git a/lib/fog/bluebox.rb b/lib/fog/bluebox.rb
@@ -84,10 +84,7 @@ def request(params)
         rescue Excon::Errors::Error => error
           raise case error
           when Excon::Errors::NotFound
-            new_error = Fog::Bluebox::NotFound
-            new_error.set_backtrace(error.backtrace)
-            new_error.verbose = error.message
-            new_error
+            Fog::Bluebox::NotFound.slurp(error)
           else
             error
           end

diff --git a/lib/fog/errors.rb b/lib/fog/errors.rb
@@ -3,6 +3,13 @@ module Errors
 
     class Error < StandardError
       attr_accessor :verbose
+
+      def self.slurp(error, message = nil)
+        new_error = new(message)
+        new_error.set_backtrace(error.backtrace)
+        new_error.verbose = error.message
+        new_error
+      end
     end
 
     class MockNotImplemented < Fog::Errors::Error; end

diff --git a/lib/fog/rackspace/servers.rb b/lib/fog/rackspace/servers.rb
@@ -105,10 +105,7 @@ def request(params)
           rescue Excon::Errors::Error => error
             raise case error
             when Excon::Errors::NotFound
-              new_error = Fog::Rackspace::Servers::NotFound
-              new_error.set_backtrace(error.backtrace)
-              new_error.verbose = error.message
-              new_error
+              Fog::Rackspace::Servers::NotFound.slurp(error)
             else
               error
             end

diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb
@@ -88,10 +88,7 @@ def request(params)
         rescue Excon::Errors::Error => error
           raise case error
           when Excon::Errors::NotFound
-            new_error = Fog::Slicehost::NotFound.new
-            new_error.set_backtrace(error.backtrace)
-            new_error.verbose = error.message
-            new_error
+            Fog::Slicehost::NotFound.slurp(error)
           else
             error
           end