lib/fastdfs-client/client_proxy.rb in fastdfs-client-1.4.4 vs lib/fastdfs-client/client_proxy.rb in fastdfs-client-2.0.0

@@ -4,36 +4,46 @@
   module Client
 
     class ClientProxy
       include MonitorMixin
 
-      attr_accessor :host, :port, :socket
+      attr_accessor :host, :port, :socket, :alive
 
       def initialize(host, port, options = {})
         super()
         options ||= {}
-        @host = host
-        @port = port
+        @host, @port = host, port
+        @alive = options.delete(:alive) || false
         
-        @socket = Socket.new(host, port, options[:socket])
+        @socket = Socket.new(host, port, options)
       end
 
       def dispose(cmd, header = [], content = [], &block)
         synchronize do
           @socket.connection do
-            contents = Array(content)
-            body_len = contents.map{|c| c.bytes.size }.inject(header.length){|sum, x| sum + x }
-            full_header = ProtoCommon.header_bytes(cmd, body_len).concat(header)
-            @socket.write(cmd, full_header)
-            contents.each do |c|
-              @socket.write(cmd, c)
+            begin
+              contents = Array(content)
+              body_len = contents.map{|c| c.bytes.size }.inject(header.length){|sum, x| sum + x }
+              full_header = ProtoCommon.header_bytes(cmd, body_len).concat(header)
+              @socket.socket.reload_data if Fastdfs::Client.mock_test && @socket.socket.respond_to?(:reload_data)
+              @socket.write(cmd, full_header)
+              contents.each do |c|
+                @socket.write(cmd, c)
+              end
+              @socket.receive &block  
+            rescue Exception => e
+              close
+              @socket.response_obj.update(status: false, err_msg: e.message)              
             end
-            @socket.receive &block
-          end
+            
+          end            
         end
       ensure
+        close unless @alive   
+      end
+      
+      def close
         @socket.close
       end
     end
-
   end
 end
\ No newline at end of file