protobuf 2.5.5-java → 2.6.0-java

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

@@ -16,13 +16,14 @@ module Protobuf
           @broker = ::Protobuf::Rpc::Zmq::Broker.new(options)
           local_worker_threads = options[:threads]
 
-          worker_options = options.merge(:port => options[:port] + 1)
+          @worker_options = options.merge(:port => options[:port] + 1)
           log_debug { sign_message("starting server workers") }
+
           local_worker_threads.times do
-            @threads << Thread.new { ::Protobuf::Rpc::Zmq::Worker.new(worker_options).run }
+            self.start_worker
           end
-          @running = true
 
+          @running = true
           log_debug { sign_message("server started") }
           while self.running? do
             @broker.poll
@@ -35,6 +36,21 @@ module Protobuf
           !!@running
         end
 
+        def self.start_worker(failed_worker = false)
+          @threads.select! { |t| t.alive? } if failed_worker
+
+          @threads << Thread.new(self, @worker_options) { |parent_server, worker_options|
+            begin
+              ::Protobuf::Rpc::Zmq::Worker.new(worker_options).run 
+            rescue => e
+              if parent_server.running?
+                log_error { parent_server.sign_message("Restart Worker on Exception: #{e.inspect}\n #{e.backtrace}") }
+                parent_server.start_worker(true)
+              end
+            end
+          }
+        end
+
         def self.stop
           @running = false
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.5.5'
+  VERSION = '2.6.0'
   PROTOC_VERSION = '2.4.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.5
+  version: 2.6.0
 platform: java
 authors: 
   - BJ Neilsen
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 Z
+date: 2013-01-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activesupport