krakow 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4b142c9d4c137f48a3f4c863185346d6111e37
-  data.tar.gz: 56732c8b17e13d4e9d0b77880ac6658642e8cac6
+  metadata.gz: 58808267d1e6b93d05a47f6c3a1caaf0f7199e32
+  data.tar.gz: c8f9d22593eae52540d0b5aa66ef2f4f58b33312
 SHA512:
-  metadata.gz: c8eff9207bbb250463f617befeb032f3a609744d0341f44d797dae80d0eb934ee27a630e7472d0ac6c08ed41b5c5c8cad5fc832dae26cd932a9d0e80909b1bd0
-  data.tar.gz: 8cb47618a5ba19cf26b3194c9a983f7b4e399ea387d8fd0258b0eb2361f39313c1b8e04c10c14d412ac9c32e310d53bd7d5051a3f7741b16fa8187f915399e96
+  metadata.gz: 498a16a7bd795a5d06de3cc3ba8c82aff77947f3e293f61d2c86e08779d00883a49e60297744465722b74618807ea9eaed88f82778317b8994a4846d31193d54
+  data.tar.gz: cb9d189af74350e55643b31227588eb0ae114c7e35d6f78c1e143c6b573b6ba44a6c2dc508630cb1edc73b7bd57761e44e740df8289925878572ff7fabf10c14

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.8
+* Remove locks and move logic to connection access
+* Check for result within response prior to access (prevent slaying actor)
+
 ## v0.3.6
 * Allow `:options` key within `Producer` to set low level connection settings
 * Make snappy an optional dependency

data/lib/krakow/connection.rb

@@ -50,7 +50,10 @@ module Krakow
     # @return [Socket-ish] underlying socket like instance
     attr_reader :socket
 
-    attr_reader :connector, :reconnector, :reconnect_notifier, :responder, :running
+    # set exclusive methods
+    exclusive :init!
+
+    attr_reader :reconnect_notifier, :running
 
     # @!group Attributes
 
@@ -95,9 +98,6 @@ module Krakow
     # @option args [Hash] :feature_args options for connection features
     def initialize(args={})
       super
-      @connector = Mutex.new
-      @reconnector = Mutex.new
-      @responder = Mutex.new
       @reconnect_notifier = Celluloid::Signals.new
       @socket_retries = 0
       @socket_max_retries = 10
@@ -120,9 +120,7 @@ module Krakow
     #
     # @return [nil]
     def init!
-      connector.synchronize do
-        connect!
-      end
+      connect!
       nil
     end
 
@@ -147,27 +145,25 @@ module Krakow
     # @param message [Krakow::Message] message to send
     # @return [Krakow::FrameType] response
     def transmit_with_response(message, wait_time)
-      responder.synchronize do
-        safe_socket{|socket| socket.write(message.to_line) }
-        responses.clear
-        response = nil
-        (wait_time / response_interval).to_i.times do |i|
-          response = responses.pop unless responses.empty?
-          break if response
-          sleep(response_interval)
+      safe_socket{|socket| socket.write(message.to_line) }
+      responses.clear
+      response = nil
+      (wait_time / response_interval).to_i.times do |i|
+        response = responses.pop unless responses.empty?
+        break if response
+        sleep(response_interval)
+      end
+      if(response)
+        message.response = response
+        if(message.error?(response))
+          res = Error::BadResponse.new "Message transmission failed #{message}"
+          res.result = response
+          abort res
         end
-        if(response)
-          message.response = response
-          if(message.error?(response))
-            res = Error::BadResponse.new "Message transmission failed #{message}"
-            res.result = response
-            abort res
-          end
-          response
-        else
-          unless(Command.response_for(message) == :error_only)
-            abort Error::BadResponse::NoResponse.new "No response provided for message #{message}"
-          end
+        response
+      else
+        unless(Command.response_for(message) == :error_only)
+          abort Error::BadResponse::NoResponse.new "No response provided for message #{message}"
         end
       end
     end
@@ -233,7 +229,7 @@ module Krakow
           if(message)
             debug "Adding message to queue #{message}"
             queue << message
-            notifier.signal(message) if notifier
+            notifier.broadcast(message) if notifier
           end
         rescue Error::ConnectionUnavailable => e
           warn "Failed to receive message: #{e.class} - #{e}"
@@ -440,30 +436,24 @@ module Krakow
     #
     # @return [nil]
     def reconnect!
-      if(reconnector.try_lock)
-        begin
-          if(@socket_max_retries <= @socket_retries)
-            abort ConnectionFailure.new "Failed to re-establish connection after #{@socket_retries} tries."
-          end
-          pause_interval = @reconnect_pause * @socket_retries
-          @socket_retries += 1
-          warn "Pausing for #{pause_interval} seconds before reconnect"
-          sleep(pause_interval)
-          init!
-          @socket_retries = 0
-        rescue Celluloid::Error => e
-          warn "Internal error encountered. Allowing exception to bubble. #{e.class}: #{e}"
-          abort e
-        rescue SystemCallError, IOError => e
-          error "Reconnect error encountered: #{e.class} - #{e}"
-          retry
+      begin
+        if(@socket_max_retries <= @socket_retries)
+          abort ConnectionFailure.new "Failed to re-establish connection after #{@socket_retries} tries."
         end
-        callback_for(:reconnect)
-        reconnect_notifier.broadcast(:connected)
-        reconnector.unlock
-      else
-        reconnect_notifier.wait(:connected)
+        pause_interval = @reconnect_pause * @socket_retries
+        @socket_retries += 1
+        warn "Pausing for #{pause_interval} seconds before reconnect"
+        sleep(pause_interval)
+        init!
+        @socket_retries = 0
+      rescue Celluloid::Error => e
+        warn "Internal error encountered. Allowing exception to bubble. #{e.class}: #{e}"
+        abort e
+      rescue SystemCallError, IOError => e
+        error "Reconnect error encountered: #{e.class} - #{e}"
+        retry
       end
+      callback_for(:reconnect)
       nil
     end
 

data/lib/krakow/consumer.rb

@@ -202,7 +202,7 @@ module Krakow
         distribution.add_connection(connection)
         true
       rescue Error::BadResponse => e
-        debug "Failed to establish connection: #{e.result.error}"
+        debug "Failed to establish connection: #{e.result ? e.result.error : '<No Response!>'}"
         connection.terminate
         false
       end

data/lib/krakow/producer.rb

@@ -16,6 +16,9 @@ module Krakow
     trap_exit  :connection_failure
     finalizer :goodbye_my_love!
 
+    # set exclusive methods
+    exclusive :write
+
     attr_reader :connection
 
     # @!group Attributes

data/lib/krakow/version.rb

@@ -1,4 +1,4 @@
 module Krakow
   # Current version
-  VERSION = Gem::Version.new('0.3.6')
+  VERSION = Gem::Version.new('0.3.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: krakow
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io