em-zmq-tp10 0.1.9 → 0.1.10

data/lib/em/protocols/zmq2/connection.rb

@@ -2,14 +2,20 @@ module EventMachine
   module Protocols
     module Zmq2
       module ConnectionMixin
+        # use watching on outbound queue when possible
+        # rely on https://github.com/eventmachine/eventmachine/pull/317 if were accepted
+        # or on https://github.com/funny-falcon/eventmachine/tree/sent_data
+        # use timers otherwise
         def sent_data
           @socket.peer_free(@peer_identity, self) if not_too_busy?
         end
 
         def not_too_busy?
-          free = _not_too_busy?
-          self.notify_when_free = !free
-          free
+          !error? && (!@socket.do_balance || begin
+            free = _not_too_busy?
+            self.notify_when_free = !free
+            free
+          end)
         end
 
         def post_init
@@ -26,6 +32,7 @@ module EventMachine
         end
 
         def unbind
+          self.notify_when_free= false
           if @peer_identity
             @socket.unregister_peer(@peer_identity)
           end

data/lib/em/protocols/zmq2/socket.rb

@@ -11,6 +11,7 @@ module EM
       class Socket
         attr :identity, :hwm
         attr_accessor :hwm_strategy
+        attr_accessor :do_balance
         GENERATED = '%GN%'.freeze
 
         # Accept options, which are dependend on socket type
@@ -31,6 +32,7 @@ module EM
           @hwm = opts[:hwm] || HWM_INFINITY
           @hwm_strategy = opts[:hwm_strategy] || :drop_last
           @identity = opts[:identity] || EMPTY
+          @do_balance = opts.fetch(:do_balance, true)
           @peers = {}
           @free_peers = {}
           @connections = {}

data/lib/em/protocols/zmq2/socket_connection.rb

@@ -41,30 +41,15 @@ module EventMachine
       #
       # It is not for end user usage
       class SocketConnection < EM::Connection
-        include ConnectionMixin
         # :stopdoc:
+        include ConnectionMixin
+
         def initialize(socket)
           @socket = socket
           @recv_buffer = ''
           @recv_frames = [[]]
         end
 
-        def unbind(err)
-          self.notify_when_free= false
-          if @peer_identity
-            @socket.unregister_peer(@peer_identity)
-          end
-          @socket.not_connected(self)
-        end
-
-        # use watching on outbound queue when possible
-        # rely on https://github.com/eventmachine/eventmachine/pull/317 if were accepted
-        # or on https://github.com/funny-falcon/eventmachine/tree/sent_data
-        # use timers otherwise
-        def sent_data
-          @socket.peer_free(@peer_identity, self) if not_too_busy?
-        end
-
         if method_defined?(:outbound_data_count)
           def _not_too_busy?
             outbound_data_count < 32
@@ -91,13 +76,6 @@ module EventMachine
           end
         end
 
-        def not_too_busy?
-          unless error?
-            free = _not_too_busy?
-            self.notify_when_free = !free
-            free
-          end
-        end
 
         def receive_data(data)
           parse_frames(data)

data/lib/em/protocols/zmq2/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module Protocols
     module Zmq2
-      VERSION = '0.1.9'
+      VERSION = '0.1.10'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-zmq-tp10
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine