fastbeans 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 81dd5cefa84f07df8a30be547a2d1f59d9a45fb1
-  data.tar.gz: 0f4246c4f140470ce697400708f34fb10dc3f3ca
+  metadata.gz: 89ea5a3305ef11598f9c2bba6d899d2d72eb621f
+  data.tar.gz: aa524d721321b2b66b26756cca5c38bc298bfcdf
 !binary "U0hBNTEy":
-  metadata.gz: 34fb78c25ae1d453793b48679a6c53ff31558e15ac584333d8354ffe98d162524b00a4700bf5c575d298b922cb435b602fe2d5422cb4aca6a74b42f9d68bdc8c
-  data.tar.gz: 641b69d5cf561bfddaca4ca165e405f04db666fc6cd60599368ceeef8db13d1f768f0aaf3db3d3bc850a509b9a86f73322c05fc9eac3160e1c6c28f225826ca5
+  metadata.gz: 8a5001e30ab099d5a221b437d8aba58f135a9fe12a32cc48b7add08c337caf36949e4788094e2ef9929146722d5e4520a2a9d2d7b1edf78a04e719c8b728c90b
+  data.tar.gz: 654b8cd94201a680eb3a0a070c212edbfde8e628db67ce9f3c6a1291b31c9efee722f0680b60379837e955c31e2bf80729eaa284067a97b30498b4a4d9ff0cef

data/lib/fastbeans/client.rb

@@ -6,10 +6,11 @@ module Fastbeans
 
   class Client
     CALL_CACHE_SIZE=100
-
+    MAX_RETRIES=3
+    
     attr_reader :call_cache
 
-    def initialize(host, port, cache_size=nil)
+    def initialize(host="127.0.0.1", port=12345, cache_size=nil)
       @host, @port = host, port
       @cache_size ||= CALL_CACHE_SIZE
       @call_cache = Rufus::Lru::SynchronizedHash.new(@cache_size)
@@ -25,27 +26,33 @@ module Fastbeans
       connect!(@host, @port)
     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
     end
 
     def call(*data)
-      retries = 0
-      begin
-        call_without_retries(*data)
-      rescue Fastbeans::RemoteConnectionFailed => e
-        if retries < 3
-          retries += 1
-          begin
-            reconnect!
-          rescue => e
-            raise RemoteConnectionDead, e.message
+      Fastbeans.benchmark("Calling: #{data.inspect}") do
+        retries = 0
+        begin
+          call_without_retries(*data)
+        rescue Fastbeans::RemoteConnectionFailed => e
+          debug(e)
+          if retries < MAX_RETRIES
+            debug("Retrying (#{retries} out of #{MAX_RETRIES} retries)")
+            retries += 1
+            begin
+              reconnect!
+            rescue => e
+              raise RemoteConnectionDead, e.message
+            end
+            retry
+          else
+            raise RemoteConnectionDead, "#{e.message} (#{retries} retries)"
           end
-          retry
-        else
-          raise RemoteConnectionDead, "#{e.message} (#{retries} retries)"
         end
       end
     end
@@ -56,7 +63,7 @@ module Fastbeans
 
     def call_without_retries(*data)
       resp = @mutex.synchronize do
-        payload = MessagePack.pack(data).force_encoding("CP1252") # fucking kill me please
+        payload = MessagePack.pack(data).force_encoding("BINARY")
         @sock.write([payload.bytesize].pack("N"))
         @sock.write(payload)
         MessagePack.load(@sock)

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/fastbeans.rb

@@ -3,4 +3,26 @@ require "fastbeans/errors"
 require "fastbeans/client"
 
 module Fastbeans
+  class << self
+    # Debug mode
+    attr_accessor :debug_mode
+
+    def debug(str_or_exc)
+      case str_or_exc
+        when String 
+          STDERR.puts("[#{Time.now}] #{str}") if self.debug_mode
+        when Exception
+          debug("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")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -108,3 +108,4 @@ signing_key:
 specification_version: 4
 summary: Ruby piece of Ruby/Clojure RPC system extracted from beanstalkapp.com
 test_files: []
+has_rdoc: