fastbeans 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 009d4f46bbf878b1cdbb7dd9306e900fdf6b7383
-  data.tar.gz: 5e3b72f8623a07078a0703e40659151ed52bcc5b
+  metadata.gz: 253535af0467722585d09f5e68012b7d7cf376d4
+  data.tar.gz: 9482dc05865476f6b32629a26ccadc9ada5365c8
 !binary "U0hBNTEy":
-  metadata.gz: f4975abf1d69929357b03767b035c787bd7d9d3795bbcca059253e66954c7851e62ae6bc3592f6f822ea5f0131cfbffc211098643816933bc0d985ecb83bd3f9
-  data.tar.gz: fbacfa11add60048ab93d02ed27c9252f7b2cad2a4d4889eb783e900880f3512e43639579484e4aff0fe8aeb5e0b245543c85382f273b72cee37301c52aa8778
+  metadata.gz: d0cad8311ce4a55d7c198a5b2443777fd362bffb77df3819731ac6b2e694967af67c542684df871f519732014a0f17e645ed715d01accc07d55e75f81436fa71
+  data.tar.gz: d390aa9d9117303fac53508e8716bd193cf1831b756767707d2dc7ae9db7f1ae58a393442143fbe37ba902e0639711ce28557bbfc5f56311b80637ad68e4754f

data/lib/fastbeans/client.rb

@@ -9,11 +9,11 @@ module Fastbeans
     
     attr_reader :call_cache
     attr_accessor :connection_class
+    attr_accessor :cache_class
 
-    def initialize(host='127.0.0.1', port=12345, cache_size=nil, pool_opts={})
+    def initialize(host='127.0.0.1', port=12345, cache=nil, pool_opts={})
       @host, @port = host, port
-      @cache_size ||= CALL_CACHE_SIZE
-      @call_cache = Rufus::Lru::SynchronizedHash.new(@cache_size)
+      @call_cache = cache || Rufus::Lru::SynchronizedHash.new(CALL_CACHE_SIZE)
       @pool_opts =  {:size => 5, :timeout => 5}.update(pool_opts)
       @connection_class = Fastbeans::Connection
     end
@@ -29,7 +29,7 @@ module Fastbeans
     end
 
     def call(*data)
-      Fastbeans.benchmark("Calling: #{data.inspect}") do
+      Fastbeans.benchmark("Calling: #{data.first.inspect}") do
         pool.with do |conn|
           conn.call(*data)
         end

data/lib/fastbeans/connection.rb

@@ -10,7 +10,12 @@ module Fastbeans
     def initialize(host, port)
       Fastbeans.debug("Connecting to #{host}:#{port}")
       @host, @port = host, port
-      @socket = connect!(@host, @port)
+      begin
+        @socket = connect!(@host, @port)
+      rescue => e 
+        Fastbeans.error(e)
+        raise RemoteConnectionDead, e.message
+      end
     end
 
     def connect!(host, port)
@@ -72,6 +77,9 @@ module Fastbeans
 
     def with_socket
       yield(get_socket)
+    rescue Exception => anything
+      disconnect!
+      raise
     end
 
     def perform(data)

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/fastbeans.rb

@@ -16,13 +16,22 @@ module Fastbeans
       end
     end
 
+    def error(str_or_exc)
+      case str_or_exc
+        when String 
+          STDERR.puts("[#{Time.now}] #{str_or_exc}")
+        when Exception
+          error("Exception: #{str_or_exc.message}\n#{str_or_exc.backtrace.join("\n")}")
+      end
+    end
+
     def benchmark(str, &blk)
       debug(str)
       t1 = Time.now
       blk.call
     ensure
       t2 = Time.now
-      debug("Time spent: #{t2-t1}s")
+      debug("Time spent: #{t2-t1}s") if t1
     end
 
     def exception(classname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack