make http_read_sock and friends use new socket API

This will need further refactoring

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/mogilefs/socket_common.rb b/lib/mogilefs/socket_common.rb
index 7ab733c..567e715 100644
--- a/lib/mogilefs/socket_common.rb
+++ b/lib/mogilefs/socket_common.rb
@@ -3,6 +3,7 @@ require "socket"
 
 module MogileFS::SocketCommon
   attr_reader :mogilefs_addr
+  attr_accessor :mogilefs_size
 
   def post_init(host, port)
     @mogilefs_addr = "#{host}:#{port}"
@@ -38,4 +39,16 @@ module MogileFS::SocketCommon
       end
     end while true
   end
+
+  def read(size, buf = "", timeout = 5)
+    timed_read(size, buf, timeout) or return # nil/EOF
+
+    while size > buf.bytesize
+      tmp ||= ""
+      timed_read(size - buf.bytesize, tmp, timeout) or return buf # truncated
+      buf << tmp
+    end
+
+    buf # full read
+  end
 end