protobuf 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa760a7ec58543a5e0cc40c95f95240646291506
-  data.tar.gz: ecd9644df44958b8f3330b574c119ba3b15e9f8d
+  metadata.gz: 2f0351f3d7c48646bd2e1bba944dd1713c5c3363
+  data.tar.gz: 1981e09677be1653d8a9330ec4cdc3467212a9a7
 SHA512:
-  metadata.gz: d33d3de6834639e094746377c53f3cebd3116306ec235fb358ce7be64ed18e2d158fdb79eb216e294ce8417a1d2962622a66d5e430245620bbd07290190d84eb
-  data.tar.gz: f3e322395f7c27c30559869d8df4147a80da23a391f4020c5df19db58295fd5a3414c18bc7198cef0100af50ce15128c2f9df83a1ee109795878334307bae9f6
+  metadata.gz: 25dbafddcde80787c44fe38651fc499016310099aeaead2de6b018443390137dafb311b840318310ef117360e5086780aa93fa88f405793aa2edf21c9b8aa197
+  data.tar.gz: 520bb7c6ad6372c560c77d6f4ee9eebb4067b60955c152242527dd8c29e878a3cca29378afa4e10a93d69adab6121737b666b04bfd5538ac5239ec3ca4d1d23d

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.8.8
+---------
+
+- ServiceDirectory beacons broadcast on same ip as listening clients. [#133, @devin-c]
+
 2.8.7
 ---------
 

data/lib/protobuf/rpc/servers/zmq/server.rb

@@ -33,10 +33,6 @@ module Protobuf
           @total_workers = total_workers + 1
         end
 
-        def backend_ip
-          frontend_ip
-        end
-
         def backend_port
           options[:worker_port] || frontend_port + 1
         end
@@ -106,6 +102,7 @@ module Protobuf
         def frontend_ip
           @frontend_ip ||= resolve_ip(options[:host])
         end
+        alias_method :backend_ip, :frontend_ip
 
         def frontend_port
           options[:port]
@@ -170,7 +167,7 @@ module Protobuf
 
           yield if block_given? # runs on startup
           wait_for_shutdown_signal
-          broadcast_flatline if broadcast_beacons? 
+          broadcast_flatline if broadcast_beacons?
           Thread.pass until reap_dead_workers.empty?
           @broker.join unless brokerless?
         ensure
@@ -248,6 +245,13 @@ module Protobuf
         def init_beacon_socket
           @beacon_socket = UDPSocket.new
           @beacon_socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_BROADCAST, true)
+          @beacon_socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, true)
+
+          if defined?(::Socket::SO_REUSEPORT)
+            @beacon_socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, true)
+          end
+
+          @beacon_socket.bind(frontend_ip, beacon_port)
           @beacon_socket.connect(beacon_ip, beacon_port)
         end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.7'
+  VERSION = '2.8.8'
   PROTOC_VERSION = '2.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.8
 platform: ruby
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport