protobuf 3.3.5 → 3.3.6

data/lib/protobuf/cli.rb

@@ -219,7 +219,6 @@ module Protobuf
         logger.info { 'RPC Server shutting down...' }
         @runner.try(:stop)
         ::Protobuf::Rpc::ServiceDirectory.instance.stop
-        logger.info { 'Shutdown complete' }
       end
 
       # Start the runner and log the relevant options.
@@ -233,6 +232,10 @@ module Protobuf
 
           ::ActiveSupport::Notifications.instrument("after_server_bind")
         end
+
+        logger.info { 'Shutdown complete' }
+
+        exit 0
       end
     end
   end

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

@@ -29,7 +29,7 @@ module Protobuf
             rc = @poller.poll(500)
 
             # The server was shutdown and no requests are pending
-            break if rc == 0 && !running?
+            break if rc == 0 && !running? && @server.workers.empty?
             # Something went wrong
             break if rc == -1
 
@@ -42,7 +42,7 @@ module Protobuf
         end
 
         def running?
-          @server.running? || @server.workers.any?
+          @server.running?
         end
 
         private
@@ -113,7 +113,7 @@ module Protobuf
         end
 
         def local_queue_available?
-          local_queue.size < local_queue_max_size
+          local_queue.size < local_queue_max_size && running?
         end
 
         def local_queue_max_size

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.3.5'
+  VERSION = '3.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -407,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3081500598642706001
+      hash: 2790172649663274140
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3081500598642706001
+      hash: 2790172649663274140
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24