about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-11-05 02:02:18 +0000
committerEric Wong <normalperson@yhbt.net>2011-11-05 02:02:18 +0000
commit972bad366ae58ec726329a45cbf908e16e1889df (patch)
tree37e001b0a293351e3d9009c812e30bb9ebe01ed5
parentd6b2624ed1f4502d499dad93ee44a716b5c56f08 (diff)
downloadmogilefs-client-972bad366ae58ec726329a45cbf908e16e1889df.tar.gz
-rw-r--r--lib/mogilefs.rb6
-rw-r--r--lib/mogilefs/mogilefs.rb5
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/mogilefs.rb b/lib/mogilefs.rb
index 00f3ab7..c4ea147 100644
--- a/lib/mogilefs.rb
+++ b/lib/mogilefs.rb
@@ -19,10 +19,7 @@ module MogileFS
   class ReadOnlyError < Error
     def message; 'readonly mogilefs'; end
   end
-  class EmptyPathError < Error
-    def message; 'Empty path for mogile upload'; end
-  end
-
+  class EmptyPathError < Error; end
   class UnsupportedPathError < Error; end
   class RequestTruncatedError < Error; end
   class InvalidResponseError < Error; end
@@ -38,4 +35,3 @@ require 'mogilefs/client'
 require 'mogilefs/bigfile'
 require 'mogilefs/mogilefs'
 require 'mogilefs/admin'
-
diff --git a/lib/mogilefs/mogilefs.rb b/lib/mogilefs/mogilefs.rb
index d17d6ec..8679d2e 100644
--- a/lib/mogilefs/mogilefs.rb
+++ b/lib/mogilefs/mogilefs.rb
@@ -108,8 +108,6 @@ class MogileFS::MogileFS < MogileFS::Client
     end
 
     case (dests[0][1] rescue nil)
-    when nil, '' then
-      raise MogileFS::EmptyPathError
     when /^http:\/\// then
       http_file = MogileFS::HTTPFile.new(dests, bytes)
       yield http_file
@@ -121,6 +119,9 @@ class MogileFS::MogileFS < MogileFS::Client
                             :path => http_file.uri.to_s,
                             :size => rv)
       rv
+    when nil, '' then
+      raise MogileFS::EmptyPathError,
+            "Empty path for mogile upload res=#{res.inspect}"
     else
       raise MogileFS::UnsupportedPathError,
             "paths '#{dests.inspect}' returned by backend is not supported"