fastbeans 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 04cdb54378919592072c8368e3c26d62366dfde5
-  data.tar.gz: e80257667320c6b26b58134008f6c24417fb6770
+  metadata.gz: 67eab3ca06d0a653513eb084cb45a0655f408427
+  data.tar.gz: 23abe57b8fe553ad1138ebf0788152ebc80a5998
 !binary "U0hBNTEy":
-  metadata.gz: 278316a00225048129fb1094eb3716368000d0ca6ee98ca9fe1bfc63341d214fc5fd630359fec2cb085161bb951acc272d11d1eb0e1097e349c6d7c182e8f45e
-  data.tar.gz: 1da6d91ff9374c9b11b1f4ddfb41bf58bb4368b3f33b40e29dfe26b397515527d8127c53db3ed4100a8b6f9715ae4e9e66f1cf5ca6b768c05b1a885a41b0694e
+  metadata.gz: 9ccbef09ae0418cef27d3036c2b883bc8cab52d4d32d261339b52132c3b1c91f695beb5e0668f4b7a900451f86b1491f9c0fdd8c1c5d40a790c8524a9f9172e9
+  data.tar.gz: 5dd5b54ed3ceb38b3ef08a0df61710078da3e6eb74d5a99f399556247c26536e1690e9b0dde21b7082fce10c8fb9d4a51e7b3f74512dfb469de3033b1e78ff1f

data/fastbeans.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "msgpack"
   spec.add_runtime_dependency "rufus-lru"
+  spec.add_runtime_dependency "connection_pool"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/fastbeans/client.rb

@@ -1,8 +1,9 @@
 require 'msgpack'
 require 'thread'
 require 'rufus-lru'
+require 'fastbeans/connection'
 require 'fastbeans/response'
-
+require 'connection_pool'
 module Fastbeans
 
   class Client
@@ -11,28 +12,21 @@ module Fastbeans
     
     attr_reader :call_cache
 
-    def initialize(host="127.0.0.1", port=12345, cache_size=nil)
+    def initialize(host="127.0.0.1", port=12345, cache_size=nil, pool_opts={})
       @host, @port = host, port
       @cache_size ||= CALL_CACHE_SIZE
       @call_cache = Rufus::Lru::SynchronizedHash.new(@cache_size)
-      connect!(host, port)
-    end
-
-    def clear_call_cache!
-      @call_cache.clear
+      @pool_opts =  {:size => 5, :timeout => 5}.update(pool_opts)
     end
 
-    def reconnect!
-      disconnect!
-      connect!(@host, @port)
+    def pool
+      @pool ||= ConnectionPool.new(@pool_opts) do
+        Fastbeans::Connection.new(@host, @port)
+      end
     end
 
-
-    def connect!(host, port)
-      Fastbeans.debug("Connecting to #{host}:#{port}")
-      @sock = TCPSocket.new(host, port)
-      @sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      @mutex = Mutex.new
+    def clear_call_cache!
+      @call_cache.clear
     end
 
     def call(*data)
@@ -63,11 +57,11 @@ module Fastbeans
     end
 
     def call_without_retries(*data)
-      raw_resp = @mutex.synchronize do
+      raw_resp = pool.with do |conn|
         payload = MessagePack.pack(data).force_encoding("BINARY")
-        @sock.write([payload.bytesize].pack("N"))
-        @sock.write(payload)
-        MessagePack.load(@sock)
+        conn.write([payload.bytesize].pack("N"))
+        conn.write(payload)
+        MessagePack.load(conn.socket)
       end
       resp = Response.new(data, raw_resp)
       resp.payload
@@ -76,12 +70,6 @@ module Fastbeans
       ne.orig_exc = e
       raise ne
     end
-
-    def disconnect!
-      if @sock
-        @sock.close rescue nil
-      end
-    end
   end
 
 end

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement