diff options
author | Eric Wong <normalperson@yhbt.net> | 2012-06-12 23:08:29 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2012-06-12 23:15:10 +0000 |
commit | 42f9969979917cae79fd98844aec6b03cf2ab880 (patch) | |
tree | 51e192fa35ba6bde07e0c1133543456634c3b4cc | |
parent | dc0fa66e56a271f4de431ecfc909686d27d73f78 (diff) | |
download | mogilefs-client-42f9969979917cae79fd98844aec6b03cf2ab880.tar.gz |
The server sending us a properly-formed "ERR" response is a big difference than an actual socket or connection error.
-rw-r--r-- | lib/mogilefs/backend.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb index a6b5e93..f611cbd 100644 --- a/lib/mogilefs/backend.rb +++ b/lib/mogilefs/backend.rb @@ -229,11 +229,15 @@ class MogileFS::Backend def do_request(cmd, args, idempotent = false) no_raise = args.delete(:ruby_no_raise) request = make_request(cmd, args) + line = nil @mutex.synchronize do begin io = dispatch_unlocked(request) - line = io.timed_gets(@timeout) and - return parse_response(line, no_raise ? request : nil) + line = io.timed_gets(@timeout) + break if /\r?\n\z/ =~ line + + line and raise MogileFS::InvalidResponseError, + "Invalid response from server: #{line.inspect}" idempotent or raise EOFError, "end of file reached after: #{request.inspect}" @@ -252,6 +256,7 @@ class MogileFS::Backend shutdown_unlocked(true) end while idempotent end # @mutex.synchronize + parse_response(line, no_raise ? request : nil) end # Makes a new request string for +cmd+ and +args+. |